acrylblends 0.7.4 → 0.7.5

package/plugins/desktop-web/main.ts

@@ -1,5 +1,5 @@
 /**
- * The desktop shell of a plain Acryl app: `npm run desktop` serves the app (`src/app.ts`, `export default app`) on a free loopback port from this Electron main process and
+ * The desktop shell of a plain Acryl app: `npm run desktop` serves the app (`src/app.ts`: `export default app`, and optionally `export const close` for a database to close) on a free loopback port from this Electron main process and
  * opens one window on it. Nothing in the app imports electron; every Electron call is in this file and `window.ts`, so a different shell is a change here only.
  *
  * Order matters: the user-data folder is set before anything else (and before the single-instance lock), so one app never shares window state, logs or the lock with
@@ -36,13 +36,19 @@ if (!app.requestSingleInstanceLock()) {
 } else {
   let server: ReturnType<typeof serve> | undefined
   let window: BrowserWindow | undefined
+  /** The app module's optional `close`, for an app that owns a database: called once the server has stopped. */
+  let closeApp: (() => Promise<void>) | undefined
 
   const shutdown = createDesktopShutdown(
     () =>
       new Promise<void>((done) => {
         if (server === undefined) return done()
         server.close(() => {
-          done()
+          const closing = closeApp?.() ?? Promise.resolve()
+          closing.then(
+            () => done(),
+            () => done(),
+          )
         })
         // Open streams and keep-alive connections would hold close() open: end them.
         ;(server as { closeAllConnections?: () => void }).closeAllConnections?.()
@@ -67,7 +73,11 @@ if (!app.requestSingleInstanceLock()) {
 
   void app.whenReady().then(async () => {
     // The hook above is registered before the app's modules are loaded, so the app may have .tsx pages: they are loaded here, not as a static import.
-    const { default: acrylApp } = await import('../../app.ts')
+    const { default: acrylApp, close } = (await import('../../app.ts')) as {
+      default: { fetch: Parameters<typeof serve>[0]['fetch'] }
+      close?: () => Promise<void>
+    }
+    closeApp = close
     const port = await new Promise<number>((resolve) => {
       server = serve(
         { fetch: acrylApp.fetch, port: 0, hostname: '127.0.0.1' },

package/plugins/desktop-web/upstream.json

@@ -5,7 +5,7 @@
       "apps/acryl-desktop/src/shell/desktop-user-data.ts": "user-data.ts",
       "apps/acryl-desktop/src/shell/shutdown.ts": "shutdown.ts"
     },
-    "commit": "eada6fb06a5cafb6c2c92a97effeba567dbd44ba"
+    "commit": "4721bb00960fa4e157e6070c330cf87c148739fc"
   },
   "rewrittenSpecifiers": 0,
   "digest": "sha256:7dfe960a8bbb476c35540d2202a7aaa62b33492c2ac3e34314e2ecfca45f32f2"

package/plugins/tsconfig.json

@@ -23,6 +23,7 @@
     "acryl-*/src/**/*.case.ts",
     "acryl-node-server/tests/adapter",
     "acryl-router/tests/loader.spec.ts",
+    "acryl-db-sqlite/tests/loader.spec.ts",
     "acryl-state/src/react.ts",
     "acryl-state/tests/react.spec.ts",
     "acryl-router-http/tests/adapter.spec.ts",

package/templates/todo/upstream.json

@@ -5,7 +5,7 @@
       "examples/acryl-todo/src/index.ts": "src/todo.ts",
       "examples/acryl-todo/src/page.ts": "src/page.ts"
     },
-    "commit": "eada6fb06a5cafb6c2c92a97effeba567dbd44ba"
+    "commit": "4721bb00960fa4e157e6070c330cf87c148739fc"
   },
   "rewrittenSpecifiers": 4,
   "digest": "sha256:9093704776563001f7f472f94cc5c2fdd79206342c1cb59c11fce62aa74df3ed"