@unchainedshop/platform 5.0.0-alpha.10 → 5.0.0-alpha.11

package/README.md

@@ -114,6 +114,9 @@ The package also exports the [built-in template resolvers](src/templates/index.t
 | `unchainedAPI` | Core modules, services, bulk importer/exporter, and options |
 | `graphqlHandler` | GraphQL Yoga server instance |
 | `db` | MongoDB database instance |
+| `shutdown` | Stops the work queue, plugins, event emitter, GraphQL server, audit log and database without exiting the process; every call returns the same promise |
+
+On `SIGTERM` / `SIGINT` the platform calls `shutdown()` and exits. Once `shutdown()` has started, these signals no longer exit the process, so exit it yourself after awaiting `shutdown()`.
 
 ## License
 

package/lib/startPlatform.d.ts

@@ -16,4 +16,5 @@ export declare const startPlatform: ({ modules, services, options, rolesOptions,
     unchainedAPI: UnchainedCore;
     graphqlHandler: any;
     db: mongodb.Db;
+    shutdown: () => Promise<void>;
 }>;

package/lib/startPlatform.js

@@ -83,13 +83,31 @@ export const startPlatform = async ({ modules, services, options, rolesOptions,
     });
     const version = UNCHAINED_API_VERSION || npm_package_version || 'n/a';
     defaultLogger.info(`Unchained Engine running`, { version });
-    let isCleaningUp = false;
+    let shutdownPromise;
+    const shutdown = () => {
+        shutdownPromise ??= (async () => {
+            defaultLogger.debug('Stopping Workqueue');
+            stopWorkqueue();
+            defaultLogger.debug('Shutting down plugins');
+            await pluginRegistry.shutdown(unchainedAPI);
+            defaultLogger.debug('Shutting down event emitter');
+            await getEmitAdapter()?.shutdown?.();
+            defaultLogger.debug('Stopping GraphQL server');
+            await graphqlHandler.dispose();
+            if (auditLog) {
+                defaultLogger.debug('Closing audit log');
+                await auditLog.close();
+            }
+            defaultLogger.debug('Stopping DB Connection');
+            await stopDb();
+        })();
+        return shutdownPromise;
+    };
     const cleanup = (signal) => async () => {
-        if (isCleaningUp) {
+        if (shutdownPromise) {
             defaultLogger.debug('Cleanup already in progress, ignoring signal', { signal });
             return;
         }
-        isCleaningUp = true;
         defaultLogger.debug('Starting cleanup', { signal });
         const forceExitTimeout = setTimeout(() => {
             defaultLogger.error('Cleanup timeout exceeded, forcing exit');
@@ -97,20 +115,7 @@ export const startPlatform = async ({ modules, services, options, rolesOptions,
         }, CLEANUP_FORCE_EXIT_TIMEOUT_MS);
         forceExitTimeout.unref();
         try {
-            defaultLogger.debug('Stopping Workqueue', { signal });
-            stopWorkqueue();
-            defaultLogger.debug('Shutting down plugins', { signal });
-            await pluginRegistry.shutdown(unchainedAPI);
-            defaultLogger.debug('Shutting down event emitter', { signal });
-            await getEmitAdapter()?.shutdown?.();
-            defaultLogger.debug('Stopping GraphQL server', { signal });
-            await graphqlHandler.dispose();
-            if (auditLog) {
-                defaultLogger.debug('Closing audit log', { signal });
-                await auditLog.close();
-            }
-            defaultLogger.debug('Stopping DB Connection', { signal });
-            await stopDb();
+            await shutdown();
             defaultLogger.debug(`Unchained Engine exiting gracefully`, { signal, version });
             clearTimeout(forceExitTimeout);
             process.exit(0);
@@ -138,5 +143,5 @@ export const startPlatform = async ({ modules, services, options, rolesOptions,
     });
     const end = performance.now();
     defaultLogger.debug(`Unchained Engine started in ${(end - start).toFixed(0)} ms`);
-    return { unchainedAPI, graphqlHandler, db };
+    return { unchainedAPI, graphqlHandler, db, shutdown };
 };

package/lib/templates/resolveEnrollmentStatusTemplate.js

@@ -1,14 +1,22 @@
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
-export const resolveEnrollmentStatusTemplate = async ({ enrollmentId }, context) => {
+export const resolveEnrollmentStatusTemplate = async ({ enrollmentId, locale }, context) => {
     const { modules } = context;
     const enrollment = await modules.enrollments.findEnrollment({ enrollmentId });
     const user = await modules.users.findUserById(enrollment.userId);
-    const subject = `${EMAIL_WEBSITE_NAME}: Updated Enrollment / ${enrollment.enrollmentNumber}`;
+    const subject = `${EMAIL_WEBSITE_NAME}: Updated Enrollment / ${enrollment.enrollmentNumber || enrollment._id}`;
     const url = `${EMAIL_WEBSITE_URL}/enrollment?_id=${enrollment._id}`;
+    const formatDate = (date) => new Date(date).toLocaleDateString(locale || 'en', { dateStyle: 'long' });
+    const scheduledDates = [
+        enrollment.expires && `Ends: ${formatDate(enrollment.expires)}`,
+        enrollment.resumeAt && `Resumes: ${formatDate(enrollment.resumeAt)}`,
+        enrollment.minimumCommitmentEnd &&
+            `Minimum commitment until: ${formatDate(enrollment.minimumCommitmentEnd)}`,
+    ].filter(Boolean);
     const text = `
   ${subject}\n
   \n
   Status: ${enrollment.status}
+  ${scheduledDates.join('\n  ')}
   \n
   -----------------\n
   Show: ${url}\n

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/platform",
   "description": "Complete e-commerce platform bundle for the Unchained Engine",
-  "version": "5.0.0-alpha.10",
+  "version": "5.0.0-alpha.11",
   "files": [
     "lib",
     "bin"
@@ -45,14 +45,14 @@
     "npm": ">=10.0.0"
   },
   "dependencies": {
-    "@unchainedshop/api": "^5.0.0-alpha.10",
-    "@unchainedshop/core": "^5.0.0-alpha.10",
-    "@unchainedshop/events": "^5.0.0-alpha.10",
-    "@unchainedshop/logger": "^5.0.0-alpha.10",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.10",
-    "@unchainedshop/plugins": "^5.0.0-alpha.10",
-    "@unchainedshop/roles": "^5.0.0-alpha.10",
-    "@unchainedshop/utils": "^5.0.0-alpha.10"
+    "@unchainedshop/api": "^5.0.0-alpha.11",
+    "@unchainedshop/core": "^5.0.0-alpha.11",
+    "@unchainedshop/events": "^5.0.0-alpha.11",
+    "@unchainedshop/logger": "^5.0.0-alpha.11",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.11",
+    "@unchainedshop/plugins": "^5.0.0-alpha.11",
+    "@unchainedshop/roles": "^5.0.0-alpha.11",
+    "@unchainedshop/utils": "^5.0.0-alpha.11"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",