@live-change/backup-service 0.8.24 → 0.8.26

package/backup.js

@@ -1,5 +1,7 @@
 import App from '@live-change/framework'
 const app = App.app()
+import definition from './definition.js'
+
 import fs from 'fs'
 import fse from 'fs-extra'
 import util from 'util'

package/clearEvents.js

@@ -0,0 +1,21 @@
+import App from '@live-change/framework'
+const app = App.app()
+import definition from './definition.js'
+
+export async function getLastEventId() {
+  if(app.splitEvents) {
+    throw new Error("getLastEventId not supported in split events mode")
+  } else {
+    const lastLogs = app.dao.get(['database', 'logRange', app.databaseName, 'events', { reverse: true, limit: 1 }])
+    const lastLog = lastLogs[0]
+    return lastLog?.id || ''
+  }
+}
+
+export async function removeOldEvents(before) {
+  if(app.splitEvents) {
+    throw new Error("removeOldEvents not supported in split events mode")
+  } else {
+    await app.dao.request(['database', 'clearLog'], app.databaseName, 'events', before)
+  }
+}

package/index.js

@@ -10,6 +10,7 @@ const expressApp = express()
 import fs from 'fs'
 import { createBackup, currentBackupPath, removeOldBackups } from './backup.js'
 import { restoreBackup } from './restore.js'
+import { getLastEventId, removeOldEvents } from './clearEvents.js'
 
 import progress from "progress-stream"
 
@@ -46,14 +47,17 @@ if(Object.keys(users) > 0) {
 }
 
 function doBackup() {
+  console.log("DOING BACKUP!")
   if(currentBackup) return currentBackup
   const path = currentBackupPath(backupsDir)
   const filename = path.slice(path.lastIndexOf('/')+1)
   currentBackup = {
     path, filename,
     promise: queue.add(async () => {
-      await removeOldBackups(backupsDir, 10*TWENTY_FOUR_HOURS, 10)
+      const lastEventId = await getLastEventId()
+      await removeOldBackups(backupsDir, 10 * TWENTY_FOUR_HOURS, 10)
       await createBackup(path)
+      if(config.clearEvents) await removeOldEvents(lastEventId)
     })
   }
   currentBackup.promise.then(done => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/backup-service",
-  "version": "0.8.24",
+  "version": "0.8.26",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -9,14 +9,14 @@
   "author": "Michał Łaszczewski <michal@emikse.com>",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@live-change/db-client": "^0.8.24",
-    "@live-change/framework": "^0.8.24",
+    "@live-change/db-client": "^0.8.26",
+    "@live-change/framework": "^0.8.26",
     "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "fs-extra": "^11.1.1",
     "p-queue": "^7.3.4",
     "progress-stream": "^2.0.0"
   },
-  "gitHead": "63e942caccbcb1c9bfbd1a3ef1d097124514c5a7",
+  "gitHead": "e62696aa9fa6e5b86312dfb64c97efa300d41147",
   "type": "module"
 }