@unchainedshop/platform 4.4.0 → 4.6.0

package/lib/migrations/createMigrationRunner.js

@@ -41,7 +41,7 @@ export const createMigrationRunner = ({ currentId, logger = console, migrationRe
             return [mostRecentId, migrations.length];
         }
         catch (e) {
-            logger.error(e.name, e);
+            logger.error(`Migration failed: ${e.name} - ${e.message}`);
             return [e.migrationId, null];
         }
     },

package/lib/platform-index.d.ts

@@ -1,5 +1,4 @@
 export * from './startPlatform.ts';
-export * from './context/index.ts';
 export * from './templates/index.ts';
 export * from './migrations/runMigrations.ts';
 export declare const printRuntimeConfiguration: () => void;

package/lib/platform-index.js

@@ -1,5 +1,4 @@
 export * from "./startPlatform.js";
-export * from "./context/index.js";
 export * from "./templates/index.js";
 export * from "./migrations/runMigrations.js";
 import { MessagingDirector, getAllAdapters } from '@unchainedshop/core';

package/lib/startPlatform.js

@@ -1,11 +1,3 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
 import { startAPIServer, roles } from '@unchainedshop/api';
 import { initCore } from '@unchainedshop/core';
 import { initDb, mongodb, stopDb } from '@unchainedshop/mongodb';
@@ -15,6 +7,7 @@ import { setupUploadHandlers } from "./setup/setupUploadHandlers.js";
 import { setupTemplates, MessageTypes } from "./setup/setupTemplates.js";
 import { stopWorkqueue, setupWorkqueue } from "./setup/setupWorkqueue.js";
 import { createMigrationRepository } from "./migrations/migrationRepository.js";
+const { UNCHAINED_API_VERSION, npm_package_version } = process.env;
 export { MessageTypes };
 const REQUIRED_ENV_VARIABLES = [
     'EMAIL_WEBSITE_NAME',
@@ -23,6 +16,7 @@ const REQUIRED_ENV_VARIABLES = [
     'ROOT_URL',
     'UNCHAINED_TOKEN_SECRET',
 ];
+const CLEANUP_FORCE_EXIT_TIMEOUT_MS = 15000;
 const exitOnMissingEnvironmentVariables = () => {
     const failedEnv = REQUIRED_ENV_VARIABLES.filter((key) => !process.env[key]);
     if (failedEnv.length > 0) {
@@ -64,22 +58,53 @@ export const startPlatform = async ({ modules, services, options, rolesOptions,
         migrationRepository,
         ...workQueueOptions,
     });
-    const { default: packageJson } = await import(__rewriteRelativeImportExtension(`${import.meta.dirname}/../package.json`), {
-        with: { type: 'json' },
-    });
-    defaultLogger.info(`Unchained Engine running`, { version: packageJson.version });
+    const version = UNCHAINED_API_VERSION || npm_package_version || 'n/a';
+    defaultLogger.info(`Unchained Engine running`, { version });
+    let isCleaningUp = false;
     const cleanup = (signal) => async () => {
-        defaultLogger.debug('Stopping Workqueue', { signal });
-        stopWorkqueue();
-        defaultLogger.debug('Stopping GraphQL server', { signal });
-        await graphqlHandler.dispose();
-        defaultLogger.debug('Stopping DB Connection', { signal });
-        await stopDb();
-        defaultLogger.debug(`Unchained Engine exiting`, { signal, version: packageJson.version });
-        process.exit(0);
+        if (isCleaningUp) {
+            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');
+            process.exit(1);
+        }, CLEANUP_FORCE_EXIT_TIMEOUT_MS);
+        forceExitTimeout.unref();
+        try {
+            defaultLogger.debug('Stopping Workqueue', { signal });
+            stopWorkqueue();
+            defaultLogger.debug('Stopping GraphQL server', { signal });
+            await graphqlHandler.dispose();
+            defaultLogger.debug('Stopping DB Connection', { signal });
+            await stopDb();
+            defaultLogger.debug(`Unchained Engine exiting gracefully`, { signal, version });
+            clearTimeout(forceExitTimeout);
+            process.exit(0);
+        }
+        catch (error) {
+            defaultLogger.error('Error during cleanup', {
+                signal,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            clearTimeout(forceExitTimeout);
+            process.exit(1);
+        }
     };
     process.on('SIGTERM', cleanup('SIGTERM'));
     process.on('SIGINT', cleanup('SIGINT'));
+    process.on('uncaughtException', async (error) => {
+        defaultLogger.error('Uncaught exception', { error: error.message, stack: error.stack });
+        await cleanup('uncaughtException')();
+    });
+    process.on('unhandledRejection', async (reason) => {
+        defaultLogger.error('Unhandled rejection', {
+            reason: reason instanceof Error ? reason.message : String(reason),
+        });
+        await cleanup('unhandledRejection')();
+    });
     const end = performance.now();
     defaultLogger.debug(`Unchained Engine started in ${(end - start).toFixed(0)} ms`);
     return { unchainedAPI, graphqlHandler, db };

package/lib/templates/resolveOrderRejectionTemplate.js

@@ -11,7 +11,7 @@ export const resolveOrderRejectionTemplate = async ({ orderId, locale }, context
     const text = `
 I'm sorry we can't confirm your order.
 
-This can happen when the payment was not successful or the order was manually canceled because of product availability or fullfillment issues.
+This can happen when the payment was not successful or the order was manually canceled because of product availability or fulfillment issues.
 
 The order in question is:
 

package/lib/templates/resolveQuotationStatusTemplate.js

@@ -2,12 +2,6 @@ const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 export const resolveQuotationStatusTemplate = async ({ quotationId }, { modules }) => {
     const quotation = await modules.quotations.findQuotation({ quotationId });
     const user = await modules.users.findUserById(quotation.userId);
-    const attachments = (await modules.files.findFiles({ 'meta.quotationId': quotation._id, 'meta.type': 'PROPOSAL' }, { sort: { 'meta.date': -1 } }))
-        .filter(Boolean)
-        .map((file) => ({
-        filename: `${quotation.quotationNumber}_${file.name}`,
-        path: file.url,
-    }));
     const subject = `${EMAIL_WEBSITE_NAME}: Updated Quotation / ${quotation.quotationNumber}`;
     const url = `${EMAIL_WEBSITE_URL}/quotation?_id=${quotation._id}`;
     const text = `
@@ -27,7 +21,6 @@ export const resolveQuotationStatusTemplate = async ({ quotationId }, { modules
                 to: modules.users.primaryEmail(user)?.address,
                 subject,
                 text,
-                attachments,
             },
         },
     ];

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unchainedshop/platform",
-  "version": "4.4.0",
+  "description": "Complete e-commerce platform bundle for the Unchained Engine",
+  "version": "4.6.0",
   "main": "lib/platform-index.js",
   "types": "lib/platform-index.d.ts",
   "type": "module",
@@ -37,15 +38,15 @@
     "npm": ">=10.0.0"
   },
   "dependencies": {
-    "@unchainedshop/api": "^4.4.0",
-    "@unchainedshop/core": "^4.4.0",
-    "@unchainedshop/events": "^4.4.0",
-    "@unchainedshop/file-upload": "^4.4.0",
-    "@unchainedshop/logger": "^4.4.0",
-    "@unchainedshop/mongodb": "^4.4.0",
-    "@unchainedshop/plugins": "^4.4.0",
-    "@unchainedshop/roles": "^4.4.0",
-    "@unchainedshop/utils": "^4.4.0",
+    "@unchainedshop/api": "^4.6.0",
+    "@unchainedshop/core": "^4.6.0",
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/file-upload": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/mongodb": "^4.6.0",
+    "@unchainedshop/plugins": "^4.6.0",
+    "@unchainedshop/roles": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0",
     "safe-stable-stringify": "^2.5.0"
   },
   "devDependencies": {

package/lib/context/index.d.ts

@@ -1 +0,0 @@
-export { default as setAccessToken } from './setAccessToken.ts';

package/lib/context/index.js

@@ -1 +0,0 @@
-export { default as setAccessToken } from "./setAccessToken.js";

package/lib/context/setAccessToken.d.ts

@@ -1,3 +0,0 @@
-import type { UnchainedCore } from '@unchainedshop/core';
-declare const _default: (unchainedAPI: UnchainedCore, username: string, plainSecret: string) => Promise<void>;
-export default _default;

package/lib/context/setAccessToken.js

@@ -1,11 +0,0 @@
-import { sha256 } from '@unchainedshop/utils';
-export default async (unchainedAPI, username, plainSecret) => {
-    const secret = await sha256(`${username}:${plainSecret}`);
-    await unchainedAPI.modules.users.updateUser({ username }, {
-        $set: {
-            'services.token': {
-                secret,
-            },
-        },
-    }, {});
-};