tweaks

bskylink/src/cache/safelinkClient.ts

@@ -3,6 +3,7 @@ import {
   CredentialSession,
   type ToolsOzoneSafelinkQueryEvents,
 } from '@atproto/api'
+import {HOUR} from '@atproto/common'
 import {LRUCache} from 'lru-cache'
 
 import {type ServiceConfig} from '../config.js'
@@ -57,7 +58,7 @@ export class SafelinkClient {
     }
 
     const urlRule = this.urlCache.get(url)
-    if (urlRule) {
+    if (urlRule && urlRule !== 'ok') {
       return urlRule
     }
 
@@ -90,11 +91,12 @@ export class SafelinkClient {
     url: string,
     pattern: RulePatternType,
   ): Promise<SafelinkRule> {
-    // @ts-ignore
     return db.db
       .selectFrom('safelink_rule')
+      .selectAll()
       .where('url', '=', url)
       .where('pattern', '=', pattern)
+      .orderBy('createdAt', 'desc')
       .executeTakeFirstOrThrow()
   }
 
@@ -125,9 +127,9 @@ export class SafelinkClient {
       })
 
     if (rule.pattern === 'domain') {
-      this.domainCache.set(rule.url, rule)
+      this.domainCache.delete(rule.url)
     } else {
-      this.urlCache.set(rule.url, rule)
+      this.urlCache.delete(rule.url)
     }
   }
 
@@ -181,6 +183,7 @@ export class SafelinkClient {
       res = await agent.tools.ozone.safelink.queryEvents({
         cursor,
         limit: 100,
+        sortDirection: 'asc',
       })
     } catch (err) {
       redirectLogger.error(
@@ -191,15 +194,13 @@ export class SafelinkClient {
       return
     }
 
-    if (res.data.cursor === this.cursor || res.data.events.length === 0) {
-      redirectLogger.info(
-        {cursor: res.data.cursor},
-        'received same cursor from Ozone',
-      )
+    if (res.data.events.length === 0) {
+      redirectLogger.info('received no new safelink events from ozone')
       setTimeout(() => this.runFetchEvents(), SAFELINK_MAX_FETCH_INTERVAL)
     } else {
       await this.db.transaction(async db => {
         for (const rule of res.data.events) {
+          redirectLogger.info(rule.id)
           if (rule.eventType === 'removeRule') {
             await this.removeRule(db, rule)
           } else {
@@ -210,7 +211,7 @@ export class SafelinkClient {
       if (res.data.cursor) {
         redirectLogger.info(
           {cursor: res.data.cursor},
-          'received new cursor from Ozone',
+          'received new safelink events from Ozone',
         )
         await this.setCursor(res.data.cursor)
       }
@@ -223,6 +224,7 @@ export class SafelinkClient {
       // TODO: catch err
       const res = await this.db.db
         .selectFrom('safelink_cursor')
+        .selectAll()
         .orderBy('createdAt desc')
         .limit(1)
         .executeTakeFirst()
@@ -230,8 +232,6 @@ export class SafelinkClient {
       if (!res) {
         return ''
       }
-
-      // @ts-ignore TODO: fix this
       this.cursor = res.cursor
     }
     return this.cursor
@@ -281,6 +281,8 @@ export class OzoneAgent {
   private session: CredentialSession
   private agent: AtpAgent
 
+  private refreshAt: number = 0
+
   constructor(pdsHost: string, identifier: string, password: string) {
     this.identifier = identifier
     this.password = password
@@ -289,13 +291,6 @@ export class OzoneAgent {
     this.agent = new AtpAgent(this.session)
   }
 
-  public async getSession(): Promise<CredentialSession> {
-    if (!this.session.hasSession) {
-      await this.getAgent()
-    }
-    return this.session
-  }
-
   public async getAgent(): Promise<AtpAgent> {
     if (!this.identifier && !this.password) {
       throw new Error(
@@ -310,6 +305,12 @@ export class OzoneAgent {
         password: this.password,
       })
       redirectLogger.info('ozone session created successfully')
+      this.refreshAt = Date.now() + HOUR
+    }
+
+    if (Date.now() <= this.refreshAt) {
+      await this.session.refreshSession()
+      this.refreshAt = Date.now() + HOUR
     }
 
     return this.agent

bskylink/src/db/migrations/002-safelink.ts

@@ -1,4 +1,4 @@
-import {type Kysely} from 'kysely'
+import {type Kysely, sql} from 'kysely'
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema
@@ -22,14 +22,16 @@ export async function up(db: Kysely<unknown>): Promise<void> {
     .execute()
 
   await db.schema
-    .createIndex('safelink_rule_url_pattern_idx')
+    .createIndex('safelink_rule_url_pattern_created_at_idx')
     .on('safelink_rule')
-    .columns(['url', 'pattern'])
+    .expression(sql`"url", "pattern", "createdAt" DESC`)
     .execute()
 }
 
 export async function down(db: Kysely<unknown>): Promise<void> {
-  await db.schema.dropIndex('safelink_rule_url_pattern_idx').execute()
+  await db.schema
+    .dropIndex('safelink_rule_url_pattern_created_at_idx')
+    .execute()
   await db.schema.dropTable('safelink_rule').execute()
   await db.schema.dropTable('safelink_cursor').execute()
 }