CR fixes

.env.development

@@ -4,6 +4,8 @@ BASE_REDIRECT_URL=http:https://localhost:3000/u/
 LOG_LEVEL=debug
 npm_package_type=module
 
+URL_EXPIRE_FROM=create #update
+
 ########## Storage ##########
 ## InMemory/Relational
 STORAGE_DRIVER=InMemory

src/config/index.ts

@@ -16,6 +16,7 @@ const rawConfig: RawConfig = {
  url: {
  matchPattern: process.env.URL_MATCH_PATTERN || '**',
  lifetime: process.env.URL_LIFETIME || '7 days',
+ urlExpireFrom: process.env.URL_EXPIRE_FROM || 'creationTime',
  },
  storage: {
  driverName: process.env.STORAGE_DRIVER || '',

src/config/normalize.ts

@@ -35,6 +35,7 @@ export function normalizeConfig({
  baseRedirectUrl,
  url: {
  lifetimeMs: ms(url.lifetime),
+ urlExpireFrom : url.urlExpireFrom,
  matchPattern: url.matchPattern,
  cleanupIntervalMs,
  },

src/config/types.ts

@@ -10,6 +10,7 @@ export interface RawConfig {
  url: {
  matchPattern: string
  lifetime: string
+ urlExpireFrom: string
  }
  storage: {
  driverName: string
@@ -39,6 +40,7 @@ export interface Config {
  url: {
  matchPattern: string
  lifetimeMs: number
+ urlExpireFrom: string
  cleanupIntervalMs: number
  }
  baseRedirectUrl: string

src/services/storage/drivers/inMemory/index.ts

@@ -1,8 +1,17 @@
 import cryptoRandomString from 'crypto-random-string'
 import { NotFoundError } from '../../../../errors/notFound.js'
+import { InvalidConfigError } from '../../../../errors/invalidConfig.js'
 import { InMemoryStorageConfig } from '../../types/config.js'
 import type { StorageDriver } from '../../types/index.js'
 import type { StoredUrl, UrlWithInformation, UrlRequestData } from '../../types/url.js'
+import { getRawConfig } from '../../../../config/__test__/helpers'
+import { logger } from '../../../logger/logger'
+
+function validateUrlExpireFrom(deleteFrom: string) {
+ if (deleteFrom !== 'create' && deleteFrom !== 'update') {
+ throw new InvalidConfigError("URL_EXPIRE_FROM value must be 'create' or 'update'")
+ }
+}
 
 export class InMemoryStorage implements StorageDriver {
  data: { urls: Map<string, StoredUrl>; urlInformation: Map<string, UrlWithInformation> } = {
@@ -39,12 +48,16 @@ export class InMemoryStorage implements StorageDriver {
  this.storage.data.urls.delete(id)
  }
  public async deleteOverdue(timespanMs: number): Promise<number> {
+ const deleteFrom = getRawConfig().url.urlExpireFrom
+ logger.debug('urlExpireFrom is {}', deleteFrom)
+ validateUrlExpireFrom(deleteFrom)
  const deleteBefore = new Date().getTime() - timespanMs
  let deletedCount = 0
 
  this.storage.data.urls.forEach((storedUrl) => {
- const createdAt = new Date(storedUrl.createdAt).getTime()
- if (createdAt <= deleteBefore) {
+ let relativeDate = new Date(storedUrl.createdAt).getTime()
+ if (deleteFrom === 'update') relativeDate = new Date(storedUrl.updatedAt).getTime()
+ if (relativeDate <= deleteBefore) {
  this.storage.data.urls.delete(storedUrl.id)
  deletedCount++
  }