fix wildcard

jgoux · jgoux · commit 73620aa08898 · 2024-08-05T12:38:36.000+02:00
diff --git a/apps/db-service/.env.example b/apps/db-service/.env.example
@@ -7,4 +7,4 @@ AWS_SECRET_ACCESS_KEY=minioadmin
 # Only if you need to test against a bucket hosted in AWS S3
 # AWS_SESSION_TOKEN=<aws-session-token>
 AWS_ENDPOINT_URL_S3=http://minio:9000
-DOMAIN=*.db.example.com
+WILDCARD_DOMAIN=db.example.com
diff --git a/apps/db-service/scripts/generate-certs.sh b/apps/db-service/scripts/generate-certs.sh
@@ -4,7 +4,7 @@ set -e
 set -o pipefail
 
 S3FS_MOUNT=${S3FS_MOUNT:=.}
-DOMAIN="${DOMAIN:=*.db.example.com}"
+DOMAIN="*.${WILDCARD_DOMAIN:=db.example.com}"
 CERT_DIR="$S3FS_MOUNT/tls"
 
 mkdir -p $CERT_DIR
diff --git a/apps/db-service/src/index.ts b/apps/db-service/src/index.ts
@@ -1,6 +1,6 @@
 import { PGlite, PGliteInterface } from '@electric-sql/pglite'
 import { vector } from '@electric-sql/pglite/vector'
-import { mkdir, readFile, access } from 'node:fs/promises'
+import { mkdir, readFile, access, rm } from 'node:fs/promises'
 import net from 'node:net'
 import { createReadStream } from 'node:fs'
 import { pipeline } from 'node:stream/promises'
@@ -111,12 +111,24 @@ const server = net.createServer((socket) => {
         // Create a directory for the database
         await mkdir(dbPath, { recursive: true });
 
-        // Extract the .tar.gz file
-        await pipeline(
-          createReadStream(dumpPath),
-          createGunzip(),
-          extract({ cwd: dbPath,  })
-        );
+        try {
+          // Extract the .tar.gz file
+          await pipeline(
+            createReadStream(dumpPath),
+            createGunzip(),
+            extract({ cwd: dbPath })
+          );
+        } catch (error) {
+          console.error(error);
+          await rm(dbPath, { recursive: true, force: true }); // Clean up the partially created directory
+          connection.sendError({
+            severity: 'FATAL',
+            code: 'XX000',
+            message: `Error extracting database: ${(error as Error).message}`,
+          });
+          connection.socket.end();
+          return;
+        }
       }
 
       db = new PGlite(dbPath, {
diff --git a/package-lock.json b/package-lock.json
