@unchainedshop/ticketing 4.8.11 → 5.0.0-alpha.2

package/lib/express.d.ts

@@ -1,3 +1,3 @@
-import express from 'express';
-declare const _default: (app: express.Express) => void;
+import type { Express } from 'express';
+declare const _default: (app: Express) => void;
 export default _default;

package/lib/express.js

@@ -1,16 +1,27 @@
-import express from 'express';
-import appleWalletHandler from "./mobile-tickets/apple-handler-express.js";
-import googleWalletHandler from "./mobile-tickets/google-handler-express.js";
-import printTicketsHandler from "./pdf-tickets/print-handler-express.js";
+import { createServerAdapter } from '@whatwg-node/server';
+import { ticketingRoutes } from "./routes.js";
 export default (app) => {
-    const { APPLE_WALLET_WEBSERVICE_PATH = '/rest/apple-wallet', GOOGLE_WALLET_WEBSERVICE_PATH = '/rest/google-wallet', UNCHAINED_PDF_PRINT_HANDLER_PATH = '/rest/print_tickets', } = process.env;
-    app.use(UNCHAINED_PDF_PRINT_HANDLER_PATH, express.json({
-        type: 'application/json',
-    }), printTicketsHandler);
-    app.use(APPLE_WALLET_WEBSERVICE_PATH, express.json({
-        type: 'application/json',
-    }), appleWalletHandler);
-    app.use(`${GOOGLE_WALLET_WEBSERVICE_PATH}/download/:tokenId`, express.json({
-        type: 'application/json',
-    }), googleWalletHandler);
+    for (const route of ticketingRoutes) {
+        const adapter = createServerAdapter(async (request, serverContext) => {
+            const context = {
+                ...serverContext.unchainedContext,
+                params: serverContext.params || {},
+            };
+            return await route.handler(request, context);
+        });
+        const expressPath = route.path.replace(/\/\*$/, '/*');
+        app.use(expressPath, async (req, res) => {
+            try {
+                await adapter.handleNodeRequestAndResponse(req, res, {
+                    unchainedContext: req.unchainedContext,
+                    params: req.params,
+                });
+            }
+            catch {
+                if (!res.headersSent) {
+                    res.status(500).json({ error: 'Internal Server Error' });
+                }
+            }
+        });
+    }
 };

package/lib/fastify.d.ts

@@ -1,3 +1,3 @@
 import type { FastifyInstance } from 'fastify';
-declare const _default: (app: FastifyInstance) => void;
+declare const _default: (fastify: FastifyInstance) => void;
 export default _default;

package/lib/fastify.js

@@ -1,26 +1,42 @@
-import appleWalletHandler from "./mobile-tickets/apple-handler-fastify.js";
-import googleWalletHandler from "./mobile-tickets/google-handler-fastify.js";
-import printTicketsHandler from "./pdf-tickets/print-handler-fastify.js";
-export default (app) => {
-    const { APPLE_WALLET_WEBSERVICE_PATH = '/rest/apple-wallet', GOOGLE_WALLET_WEBSERVICE_PATH = '/rest/google-wallet', UNCHAINED_PDF_PRINT_HANDLER_PATH = '/rest/print_tickets', } = process.env;
-    app.route({
-        url: `${APPLE_WALLET_WEBSERVICE_PATH}/*`,
-        method: ['GET', 'POST', 'DELETE'],
-        handler: appleWalletHandler,
-    });
-    app.route({
-        url: `${GOOGLE_WALLET_WEBSERVICE_PATH}/download/:tokenId`,
-        method: 'GET',
-        handler: googleWalletHandler,
-    });
-    app.route({
-        url: `${UNCHAINED_PDF_PRINT_HANDLER_PATH}`,
-        method: 'GET',
-        handler: printTicketsHandler,
-    });
-    app.route({
-        url: `${UNCHAINED_PDF_PRINT_HANDLER_PATH}/*`,
-        method: 'GET',
-        handler: printTicketsHandler,
+import { createServerAdapter } from '@whatwg-node/server';
+import { ticketingRoutes } from "./routes.js";
+export default (fastify) => {
+    if (ticketingRoutes.length === 0)
+        return;
+    fastify.register((scope, opts, registered) => {
+        scope.removeAllContentTypeParsers();
+        scope.addContentTypeParser('*', function (request, payload, done) {
+            done(null);
+        });
+        for (const route of ticketingRoutes) {
+            const adapter = createServerAdapter(async (request, serverContext) => {
+                const context = {
+                    ...serverContext.unchainedContext,
+                    params: serverContext.params || {},
+                };
+                return await route.handler(request, context);
+            });
+            const fastifyPath = route.path.replace(/\/\*$/, '/*');
+            scope.all(fastifyPath, async (req, reply) => {
+                try {
+                    const response = await adapter.handleNodeRequestAndResponse(req.raw, reply.raw, {
+                        unchainedContext: req.unchainedContext,
+                        params: req.params,
+                    });
+                    response.headers.forEach((value, key) => {
+                        reply.header(key, value);
+                    });
+                    reply.status(response.status);
+                    reply.send(response.body || undefined);
+                    return reply;
+                }
+                catch {
+                    if (!reply.sent) {
+                        reply.status(500).send({ error: 'Internal Server Error' });
+                    }
+                }
+            });
+        }
+        registered();
     });
 };

package/lib/index.d.ts

@@ -1,8 +1,12 @@
+import type { UnchainedCore } from '@unchainedshop/core';
 import { RendererTypes } from './template-registry.ts';
 import ticketingModules, { type TicketingModule } from './module.ts';
-import type { TicketingAPI } from './types.ts';
 import ticketingServices, { type TicketingServices } from './services.ts';
-export type { TicketingAPI, RendererTypes, TicketingModule, TicketingServices };
+export type TicketingAPI = UnchainedCore & {
+    modules: TicketingModule;
+    services: TicketingServices;
+};
+export type { RendererTypes, TicketingModule, TicketingServices };
 export { ticketingServices, ticketingModules };
 export declare function setupPDFTickets({ renderOrderPDF }: {
     renderOrderPDF: any;

package/lib/routes.js

@@ -54,7 +54,7 @@ export async function googleWalletHandler(request, context) {
         }
         const url = new URL(request.url);
         const hash = url.searchParams.get('hash');
-        const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
+        const correctHash = await modules.warehousing.buildAccessKeyFromToken(token);
         if (!hash || hash !== correctHash) {
             return new Response(JSON.stringify({ error: 'Token hash invalid for current owner' }), {
                 status: 403,
@@ -96,7 +96,7 @@ export async function appleWalletHandler(request, context) {
                 });
             }
             const hash = url.searchParams.get('hash');
-            const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
+            const correctHash = await modules.warehousing.buildAccessKeyFromToken(token);
             if (!hash || hash !== correctHash) {
                 return new Response(JSON.stringify({ error: 'Token hash invalid for current owner' }), {
                     status: 403,

package/lib/services.js

@@ -7,7 +7,9 @@ async function cancelTicketsForProduct(productId) {
         await this.warehousing.invalidateToken(token._id);
         await this.passes.cancelTicket(token._id);
     }
-    await this.products.update(productId, { 'meta.cancelled': true });
+    await this.products.update(productId, {
+        $set: { 'meta.cancelled': true },
+    });
     return tokensToCancel.length;
 }
 export default {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/ticketing",
   "description": "Event ticketing extension for the Unchained Engine with PDF and wallet pass support",
-  "version": "4.8.11",
+  "version": "5.0.0-alpha.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "type": "module",
@@ -34,17 +34,17 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^4.6.0",
-    "@unchainedshop/core": "^4.6.0",
-    "@unchainedshop/core-files": "^4.6.0",
-    "@unchainedshop/core-warehousing": "^4.6.0",
-    "@unchainedshop/core-worker": "^4.6.0",
-    "@unchainedshop/events": "^4.6.0",
-    "@unchainedshop/logger": "^4.6.0",
-    "@unchainedshop/mongodb": "^4.6.0"
+    "@unchainedshop/api": "^5.0.0-alpha.1",
+    "@unchainedshop/core": "^5.0.0-alpha.1",
+    "@unchainedshop/core-files": "^5.0.0-alpha.1",
+    "@unchainedshop/core-warehousing": "^5.0.0-alpha.1",
+    "@unchainedshop/core-worker": "^5.0.0-alpha.1",
+    "@unchainedshop/events": "^5.0.0-alpha.1",
+    "@unchainedshop/logger": "^5.0.0-alpha.1",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@parse/node-apn": "^7.0.1",
+    "@parse/node-apn": "^8.1.0",
     "express": "5.x",
     "fastify": ">= 5.2 < 6"
   },
@@ -60,6 +60,7 @@
     }
   },
   "devDependencies": {
+    "@parse/node-apn": "^8.1.0",
     "@types/express": "^5.0.3",
     "@types/node": "^25.0.0",
     "express": "^5.1.0",