@unchainedshop/plugins 4.0.0-rc.8 → 4.0.0

package/lib/pricing/product-swiss-tax.js

@@ -1,24 +1,6 @@
 import { ProductPricingDirector, ProductPricingAdapter, ProductPricingRowCategory, } from '@unchainedshop/core';
-import { SwissTaxCategories } from './tax/ch.js';
-export const getTaxRate = (context) => {
-    const { product, order } = context;
-    const productSpecialTaxTag = product.tags?.find((tag) => tag?.trim().toLowerCase().startsWith('swiss-tax-category:'));
-    const taxCategory = Object.values(SwissTaxCategories).find((t) => `swiss-tax-category:${t.value}` === productSpecialTaxTag?.trim().toLowerCase()) || SwissTaxCategories.DEFAULT;
-    return taxCategory.rate(order?.ordered);
-};
-export const isDeliveryAddressInSwitzerland = async ({ order, countryCode: forceCountryCode, modules, }) => {
-    let countryCode = forceCountryCode?.toUpperCase().trim() || order.countryCode;
-    if (order) {
-        const orderDelivery = await modules.orders.deliveries.findDelivery({
-            orderDeliveryId: order.deliveryId,
-        });
-        const address = orderDelivery?.context?.address || order.billingAddress;
-        if (address?.countryCode > '') {
-            countryCode = address.countryCode?.toUpperCase().trim();
-        }
-    }
-    return countryCode === 'CH' || countryCode === 'LI';
-};
+import { resolveTaxCategoryFromDeliveryProvider, resolveTaxCategoryFromProduct, SwissTaxCategories, } from './tax/ch.js';
+import isDeliveryAddressInCountry from './utils/isDeliveryAddressInCountry.js';
 export const ProductSwissTax = {
     ...ProductPricingAdapter,
     key: 'shop.unchained.pricing.product-swiss-tax',
@@ -34,10 +16,32 @@ export const ProductSwissTax = {
         return {
             ...pricingAdapter,
             calculate: async () => {
-                if (!(await isDeliveryAddressInSwitzerland(context))) {
+                const orderDelivery = context.order?.deliveryId
+                    ? await context.modules.orders.deliveries.findDelivery({
+                        orderDeliveryId: context.order?.deliveryId,
+                    })
+                    : null;
+                if (!isDeliveryAddressInCountry({
+                    ...context,
+                    orderDelivery,
+                }, ['CH', 'LI'])) {
                     return pricingAdapter.calculate();
                 }
-                const taxRate = getTaxRate(context);
+                let taxCategory = resolveTaxCategoryFromProduct(context.product);
+                if (!taxCategory) {
+                    // No special tax category found, use default from delivery provider
+                    const provider = orderDelivery?.deliveryProviderId
+                        ? await context.modules.delivery.findProvider({
+                            deliveryProviderId: orderDelivery?.deliveryProviderId,
+                        })
+                        : null;
+                    if (provider)
+                        taxCategory = resolveTaxCategoryFromDeliveryProvider(provider);
+                }
+                // If still no tax category found, use default
+                if (!taxCategory)
+                    taxCategory = SwissTaxCategories.DEFAULT;
+                const taxRate = taxCategory.rate(context.order?.ordered);
                 ProductPricingAdapter.log(`ProductSwissTax -> Tax Multiplicator: ${taxRate}`);
                 params.calculationSheet.filterBy({ isTaxable: true }).forEach(({ isNetPrice, ...row }) => {
                     if (!isNetPrice) {

package/lib/pricing/product-swiss-tax.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/product-swiss-tax.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/product-swiss-tax.ts"],"names":[],"mappings":"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"}

package/lib/pricing/tax/ch.d.ts

@@ -1,5 +1,10 @@
-export declare const SwissTaxCategories: Record<string, {
+import { DeliveryProvider } from '@unchainedshop/core-delivery';
+import { Product } from '@unchainedshop/core-products';
+export interface SwissTaxCategoryResolver {
     value: string;
     rate: (referenceDate?: Date) => number;
-}>;
+}
+export declare const SwissTaxCategories: Record<string, SwissTaxCategoryResolver>;
+export declare const resolveTaxCategoryFromDeliveryProvider: (provider: DeliveryProvider) => SwissTaxCategoryResolver | null;
+export declare const resolveTaxCategoryFromProduct: (product: Product) => SwissTaxCategoryResolver | null;
 //# sourceMappingURL=ch.d.ts.map

package/lib/pricing/tax/ch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ch.d.ts","sourceRoot":"","sources":["../../../src/pricing/tax/ch.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,kBAAkB,EAAE,MAAM,CACrC,MAAM,EACN;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,IAAI,KAAK,MAAM,CAAC;CACxC,CA6BF,CAAC"}
+{"version":3,"file":"ch.d.ts","sourceRoot":"","sources":["../../../src/pricing/tax/ch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAMvD,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,IAAI,KAAK,MAAM,CAAC;CACxC;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CA4BvE,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,UAAU,gBAAgB,KACzB,wBAAwB,GAAG,IAU7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,SAAS,OAAO,KAAG,wBAAwB,GAAG,IAQ3F,CAAC"}

package/lib/pricing/tax/ch.js

@@ -1,5 +1,4 @@
 const startOf2024 = new Date('2024-01-01T00:00:00.000+0100');
-// https://www.estv.admin.ch/estv/en/home/value-added-tax/vat-rates-switzerland.html
 export const SwissTaxCategories = {
     DEFAULT: {
         value: 'default',
@@ -29,4 +28,20 @@ export const SwissTaxCategories = {
         },
     },
 };
+export const resolveTaxCategoryFromDeliveryProvider = (provider) => {
+    const taxCategoryFromProvider = provider?.configuration
+        ?.find(({ key }) => {
+        if (key === 'swiss-tax-category')
+            return true;
+        return null;
+    })
+        ?.value?.toUpperCase();
+    const taxCategory = taxCategoryFromProvider ? SwissTaxCategories[taxCategoryFromProvider] : null;
+    return taxCategory;
+};
+export const resolveTaxCategoryFromProduct = (product) => {
+    const productSpecialTaxTag = product.tags?.find((tag) => tag?.trim().toLowerCase().startsWith('swiss-tax-category:'));
+    const taxCategory = Object.values(SwissTaxCategories).find((t) => `swiss-tax-category:${t.value}` === productSpecialTaxTag?.trim().toLowerCase());
+    return taxCategory || null;
+};
 //# sourceMappingURL=ch.js.map

package/lib/pricing/tax/ch.js.map

@@ -1 +1 @@
-{"version":3,"file":"ch.js","sourceRoot":"","sources":["../../../src/pricing/tax/ch.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,8BAA8B,CAAC,CAAC;AAE7D,oFAAoF;AAEpF,MAAM,CAAC,MAAM,kBAAkB,GAM3B;IACF,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IACD,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IACD,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"ch.js","sourceRoot":"","sources":["../../../src/pricing/tax/ch.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,8BAA8B,CAAC,CAAC;AAS7D,MAAM,CAAC,MAAM,kBAAkB,GAA6C;IAC1E,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IACD,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IACD,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,QAA0B,EACO,EAAE;IACnC,MAAM,uBAAuB,GAAG,QAAQ,EAAE,aAAa;QACrD,EAAE,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;QACjB,IAAI,GAAG,KAAK,oBAAoB;YAAE,OAAO,IAAI,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;QACF,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAEzB,MAAM,WAAW,GAAG,uBAAuB,CAAC,CAAC,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,OAAgB,EAAmC,EAAE;IACjG,MAAM,oBAAoB,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACtD,GAAG,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAC5D,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACxD,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,KAAK,oBAAoB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CACtF,CAAC;IACF,OAAO,WAAW,IAAI,IAAI,CAAC;AAC7B,CAAC,CAAC"}

package/lib/pricing/utils/isDeliveryAddressInCountry.d.ts

@@ -0,0 +1,7 @@
+import { Order, OrderDelivery } from '@unchainedshop/core-orders';
+export default function isDeliveryAddressInCountry({ orderDelivery, order, countryCode: forceCountryCode, }: {
+    orderDelivery?: OrderDelivery | null;
+    order?: Order | null;
+    countryCode?: string | null;
+}, allowedCountryCodes: string[]): boolean;
+//# sourceMappingURL=isDeliveryAddressInCountry.d.ts.map

package/lib/pricing/utils/isDeliveryAddressInCountry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isDeliveryAddressInCountry.d.ts","sourceRoot":"","sources":["../../../src/pricing/utils/isDeliveryAddressInCountry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,EACE,aAAa,EACb,KAAK,EACL,WAAW,EAAE,gBAAuB,GACrC,EAAE;IACD,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,EACD,mBAAmB,EAAE,MAAM,EAAE,WAa9B"}

package/lib/pricing/utils/isDeliveryAddressInCountry.js

@@ -0,0 +1,13 @@
+export default function isDeliveryAddressInCountry({ orderDelivery, order, countryCode: forceCountryCode = null, }, allowedCountryCodes) {
+    let countryCode = forceCountryCode?.toUpperCase().trim() || order?.countryCode;
+    if (orderDelivery || order) {
+        const address = orderDelivery?.context?.address || order?.billingAddress;
+        if (address?.countryCode > '') {
+            countryCode = address.countryCode?.toUpperCase().trim();
+        }
+    }
+    if (!countryCode)
+        return false;
+    return allowedCountryCodes.includes(countryCode);
+}
+//# sourceMappingURL=isDeliveryAddressInCountry.js.map

package/lib/pricing/utils/isDeliveryAddressInCountry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isDeliveryAddressInCountry.js","sourceRoot":"","sources":["../../../src/pricing/utils/isDeliveryAddressInCountry.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,EACE,aAAa,EACb,KAAK,EACL,WAAW,EAAE,gBAAgB,GAAG,IAAI,GAKrC,EACD,mBAA6B;IAE7B,IAAI,WAAW,GAAG,gBAAgB,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,WAAW,CAAC;IAE/E,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,cAAc,CAAC;QACzE,IAAI,OAAO,EAAE,WAAW,GAAG,EAAE,EAAE,CAAC;YAC9B,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/B,OAAO,mBAAmB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACnD,CAAC"}

package/lib/warehousing/eth-minter.js

@@ -1,10 +1,12 @@
-import { WarehousingDirector, WarehousingAdapter, } from '@unchainedshop/core';
+import { WarehousingError, WarehousingDirector, WarehousingAdapter, } from '@unchainedshop/core';
 import { WarehousingProviderType } from '@unchainedshop/core-warehousing';
 import { ProductContractStandard, ProductTypes } from '@unchainedshop/core-products';
 import { systemLocale } from '@unchainedshop/utils';
 import { generateDbObjectId } from '@unchainedshop/mongodb';
 import { getFileAdapter } from '@unchainedshop/core-files';
+import { createLogger } from '@unchainedshop/logger';
 const { MINTER_TOKEN_OFFSET = '0', ROOT_URL = 'http://localhost:4010' } = process.env;
+const logger = createLogger('unchained:eth-minter');
 const ETHMinter = {
     ...WarehousingAdapter,
     key: 'shop.unchained.warehousing.infinite-minter',
@@ -23,7 +25,7 @@ const ETHMinter = {
                 ? { contractAddress: contractStandard }
                 : {
                     contractAddress: contractStandard,
-                    chainTokenId: tokenId,
+                    tokenSerialNumber: tokenId,
                 });
             const tokensCreated = existingTokens.reduce((acc, curToken) => {
                 return acc + curToken.quantity;
@@ -36,6 +38,10 @@ const ETHMinter = {
                 return product?.type === ProductTypes.TokenizedProduct;
             },
             configurationError() {
+                if (contractStandard === 'ERC1155' && !tokenId) {
+                    logger.error(`Token ID is required for ERC1155 contract standard (productId: ${product._id})`);
+                    return WarehousingError.INCOMPLETE_CONFIGURATION;
+                }
                 return null;
             },
             stock: async () => {
@@ -49,11 +55,14 @@ const ETHMinter = {
                 const chainId = configuration.find(({ key }) => key === 'chainId')?.value || undefined;
                 const meta = { contractStandard };
                 const tokensCreated = await getTokensCreated();
+                if (!orderPosition) {
+                    throw new Error('Order position not found in context');
+                }
                 if (contractStandard === 'ERC721') {
-                    // ERC721 is non-fungible, thus every chainTokenId unique!
-                    const items = new Array(orderPosition?.quantity).fill(null).map((_, i) => ({
+                    // ERC721 is non-fungible, thus every tokenSerialNumber unique!
+                    const items = new Array(orderPosition.quantity).fill(null).map((_, i) => ({
                         _id: generateDbObjectId(),
-                        chainTokenId: Number(parseInt(MINTER_TOKEN_OFFSET, 10) + tokensCreated + (i + 1)).toString(),
+                        tokenSerialNumber: Number(parseInt(MINTER_TOKEN_OFFSET, 10) + tokensCreated + (i + 1)).toString(),
                         contractAddress,
                         quantity: 1,
                         chainId,
@@ -65,18 +74,21 @@ const ETHMinter = {
                 return [
                     {
                         _id: generateDbObjectId(),
-                        chainTokenId: tokenId,
+                        tokenSerialNumber: tokenId,
                         contractAddress,
-                        quantity: orderPosition?.quantity,
+                        quantity: orderPosition.quantity,
                         chainId,
                         meta,
                     },
                 ];
             },
-            tokenMetadata: async (chainTokenId) => {
+            tokenMetadata: async (tokenSerialNumber) => {
                 // Metadata standards supported
                 // https://eips.ethereum.org/EIPS/eip-1155 (backward compatible with 721)
                 // https://eips.ethereum.org/EIPS/eip-721
+                if (!product) {
+                    throw new Error('Product not found in context');
+                }
                 const allLanguages = await modules.languages.findLanguages({
                     includeInactive: false,
                 });
@@ -85,14 +97,14 @@ const ETHMinter = {
                     limit: 1,
                 });
                 const file = firstMedia && (await modules.files.findFile({ fileId: firstMedia.mediaId }));
-                const fileUploadAdapter = getFileAdapter();
-                const signedUrl = await fileUploadAdapter.createDownloadURL(file);
+                const fileAdapter = file && getFileAdapter();
+                const signedUrl = await fileAdapter?.createDownloadURL(file);
                 const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
                 const text = await modules.products.texts.findLocalizedText({
                     productId: product._id,
                     locale: locale || systemLocale,
                 });
-                const name = `${text.title} #${chainTokenId}`;
+                const name = `${text.title} #${tokenSerialNumber}`;
                 const isDefaultLanguageActive = locale ? locale.language === systemLocale.language : true;
                 const localization = isDefaultLanguageActive
                     ? {

package/lib/warehousing/eth-minter.js.map

@@ -1 +1 @@
-{"version":3,"file":"eth-minter.js","sourceRoot":"","sources":["../../src/warehousing/eth-minter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eth-minter.js","sourceRoot":"","sources":["../../src/warehousing/eth-minter.ts"],"names":[],"mappings":"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"}

package/lib/worker/budgetsms.d.ts

@@ -0,0 +1,10 @@
+export declare function checkBudgetSmsCredentials(): Promise<{
+    success: boolean;
+    credit: number;
+    error?: undefined;
+} | {
+    error: any;
+    success?: undefined;
+    credit?: undefined;
+}>;
+//# sourceMappingURL=budgetsms.d.ts.map

package/lib/worker/budgetsms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"budgetsms.d.ts","sourceRoot":"","sources":["../../src/worker/budgetsms.ts"],"names":[],"mappings":"AA8OA,wBAAsB,yBAAyB;;;;;;;;GA6B9C"}

package/lib/worker/budgetsms.js

@@ -0,0 +1,217 @@
+import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core';
+const { BUDGETSMS_USERNAME, BUDGETSMS_USERID, BUDGETSMS_HANDLE } = process.env;
+// BudgetSMS Plugin - Verified against official API documentation
+// Note: BudgetSMS API has a quirk where it returns error 1001 (authentication failed)
+// when you have insufficient credit, instead of the correct error 1003.
+const BudgetSMSWorker = {
+    ...WorkerAdapter,
+    key: 'shop.unchained.worker-plugin.budgetsms',
+    label: 'Send Messages through BudgetSMS',
+    version: '1.0.0',
+    type: 'BUDGETSMS',
+    doWork: async ({ from, to, text, test = false, customid, price = false, mccmnc = false, credit = false, ...params }) => {
+        try {
+            // Validate credentials
+            if (!BUDGETSMS_USERNAME || !BUDGETSMS_USERID || !BUDGETSMS_HANDLE) {
+                throw new Error('Missing BudgetSMS credentials. Please set BUDGETSMS_USERNAME, BUDGETSMS_USERID, and BUDGETSMS_HANDLE');
+            }
+            // Trim credentials to remove any whitespace
+            const username = BUDGETSMS_USERNAME.trim();
+            const userid = BUDGETSMS_USERID.trim();
+            const handle = BUDGETSMS_HANDLE.trim();
+            // Validate userid is numeric only
+            if (!/^\d+$/.test(userid)) {
+                throw new Error('BUDGETSMS_USERID must be numeric only. Found: ' + userid);
+            }
+            // Choose endpoint based on test mode
+            const url = test ? 'https://api.budgetsms.net/testsms/' : 'https://api.budgetsms.net/sendsms/';
+            // Format phone number according to E.164 (no + or 00, no spaces/dashes)
+            const formattedTo = to.replace(/^\+|^00/, '').replace(/[\s-]/g, '');
+            // Build query parameters
+            const queryParams = new URLSearchParams({
+                username: username,
+                userid: userid,
+                handle: handle,
+                msg: text || '', // Note: parameter is 'msg' not 'text'
+                from: from || '',
+                to: formattedTo,
+                ...(customid && { customid }),
+                ...(!test && price && { price: '1' }), // Price info only for real sends
+                ...(!test && mccmnc && { mccmnc: '1' }), // Carrier info only for real sends
+                ...(!test && credit && { credit: '1' }), // Credit info only for real sends
+                ...params,
+            });
+            // Make GET request
+            const fullUrl = `${url}?${queryParams.toString()}`;
+            const response = await fetch(fullUrl, {
+                method: 'GET',
+                headers: {
+                    Accept: 'text/plain',
+                    'User-Agent': 'Unchained/BudgetSMS-Plugin',
+                },
+            });
+            const responseText = await response.text().then((text) => text.trim());
+            // Parse response: "OK <smsid> [price] [parts] [mccmnc] [credit]" or "ERR <errorcode>"
+            if (responseText.startsWith('OK')) {
+                const parts = responseText.split(' ');
+                const result = {
+                    sms_id: parts[1] || null,
+                    status: test ? 'test_successful' : 'sent',
+                    test_mode: test,
+                };
+                if (test) {
+                    result.message = 'Test SMS validated successfully (no credit deducted)';
+                }
+                else {
+                    // Parse additional info based on parameters used
+                    let index = 2;
+                    if (price && parts[index] && parts[index + 1]) {
+                        result.price = parseFloat(parts[index]);
+                        result.parts = parseInt(parts[index + 1]);
+                        index += 2;
+                    }
+                    if (mccmnc && parts[index]) {
+                        result.mccmnc = parts[index];
+                        index += 1;
+                    }
+                    if (credit && parts[index]) {
+                        result.remaining_credit = parseFloat(parts[index]);
+                    }
+                }
+                return {
+                    success: true,
+                    result,
+                    error: null,
+                };
+            }
+            if (responseText.startsWith('ERR')) {
+                const parts = responseText.split(' ');
+                const errorCode = parts[1] || 'UNKNOWN';
+                // Error code mappings from documentation
+                const errorMessages = {
+                    '1001': 'Authentication failed OR insufficient credit (BudgetSMS returns 1001 for both)',
+                    '1002': 'Account not active',
+                    '1003': 'Insufficient credit',
+                    '1004': 'No access to this API',
+                    '1005': 'No handle provided',
+                    '1006': 'No UserID provided',
+                    '1007': 'No Username provided',
+                    '2001': 'SMS message text is empty',
+                    '2002': 'SMS numeric senderid can be max. 16 numbers',
+                    '2003': 'SMS alphanumeric sender can be max. 11 characters',
+                    '2004': 'SMS senderid is empty or invalid',
+                    '2005': 'Destination number is too short',
+                    '2006': 'Destination is not numeric',
+                    '2007': 'Destination is empty',
+                    '2008': 'SMS text is not OK (check encoding?)',
+                    '2009': 'Parameter issue',
+                    '2010': 'Destination number is invalidly formatted',
+                    '2011': 'Destination is invalid',
+                    '2012': 'SMS message text is too long',
+                    '2013': 'SMS message is invalid',
+                    '2014': 'SMS CustomID is used before',
+                    '2015': 'Charset problem',
+                    '2016': 'Invalid UTF-8 encoding',
+                    '3001': 'No route to destination',
+                    '3002': 'No routes are setup',
+                    '3003': 'Invalid destination',
+                    '4001': 'System error, related to customid',
+                    '4002': 'System error, temporary issue',
+                };
+                // Special handling for 1001 error
+                let message = errorMessages[errorCode] || `Unknown error code: ${errorCode}`;
+                if (errorCode === '1001') {
+                    message += '. Note: Check your account balance - BudgetSMS may return 1001 when credit is 0.';
+                }
+                return {
+                    success: false,
+                    error: {
+                        name: 'BUDGETSMS_ERROR',
+                        code: errorCode,
+                        message,
+                    },
+                };
+            }
+            // Unexpected response
+            return {
+                success: false,
+                error: {
+                    name: 'BUDGETSMS_ERROR',
+                    message: 'Unexpected response format from BudgetSMS API',
+                    response: responseText,
+                },
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: {
+                    name: err.name,
+                    message: err.message,
+                    stack: err.stack,
+                },
+            };
+        }
+    },
+};
+WorkerDirector.registerAdapter(BudgetSMSWorker);
+// Environment variables needed:
+// BUDGETSMS_USERNAME=your_username (alphanumeric)
+// BUDGETSMS_USERID=your_userid (NUMERIC ONLY - found in BudgetSMS control panel)
+// BUDGETSMS_HANDLE=your_api_handle (alphanumeric - found in BudgetSMS control panel)
+// IMPORTANT: The userid MUST be numeric only. You can find it in the BudgetSMS control panel after login.
+// Example: BUDGETSMS_USERID=12345 (NOT "user12345" or any non-numeric value)
+// Usage examples:
+//
+// Send real SMS (requires credits):
+// await WorkerDirector.doWork({
+//   type: 'BUDGETSMS',
+//   from: 'YourCompany',
+//   to: '+41791234567',
+//   text: 'Your message here',
+//   price: true, // Get price info
+//   credit: true, // Get remaining credit
+// });
+//
+// Test SMS (no credit deducted):
+// await WorkerDirector.doWork({
+//   type: 'BUDGETSMS',
+//   test: true,
+//   from: 'YourCompany',
+//   to: '+41791234567',
+//   text: 'Test message',
+// });
+//
+// IMPORTANT: If you get error 1001, it could mean either:
+// 1. Authentication failed (wrong credentials)
+// 2. Insufficient credit (0 balance)
+// Use the checkBudgetSmsCredentials() helper to verify which one it is.
+// Helper function to check credentials and balance
+export async function checkBudgetSmsCredentials() {
+    const url = 'https://api.budgetsms.net/checkcredit/';
+    const username = process.env.BUDGETSMS_USERNAME?.trim();
+    const userid = process.env.BUDGETSMS_USERID?.trim();
+    const handle = process.env.BUDGETSMS_HANDLE?.trim();
+    if (!username || !userid || !handle) {
+        return { error: 'Missing credentials' };
+    }
+    if (!/^\d+$/.test(userid)) {
+        return { error: 'UserID must be numeric only' };
+    }
+    const queryParams = new URLSearchParams({ username, userid, handle });
+    try {
+        const response = await fetch(`${url}?${queryParams.toString()}`, { method: 'GET' });
+        const text = await response.text();
+        if (text.startsWith('OK')) {
+            const credit = parseFloat(text.split(' ')[1]) || 0;
+            return { success: true, credit };
+        }
+        else {
+            return { error: text };
+        }
+    }
+    catch (err) {
+        return { error: err.message };
+    }
+}
+//# sourceMappingURL=budgetsms.js.map

package/lib/worker/budgetsms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"budgetsms.js","sourceRoot":"","sources":["../../src/worker/budgetsms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE/E,iEAAiE;AACjE,sFAAsF;AACtF,wEAAwE;AACxE,MAAM,eAAe,GAajB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,wCAAwC;IAC7C,KAAK,EAAE,iCAAiC;IACxC,OAAO,EAAE,OAAO;IAEhB,IAAI,EAAE,WAAW;IAEjB,MAAM,EAAE,KAAK,EAAE,EACb,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,KAAK,EACZ,QAAQ,EACR,KAAK,GAAG,KAAK,EACb,MAAM,GAAG,KAAK,EACd,MAAM,GAAG,KAAK,EACd,GAAG,MAAM,EACV,EAAE,EAAE;QACH,IAAI,CAAC;YACH,uBAAuB;YACvB,IAAI,CAAC,kBAAkB,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAClE,MAAM,IAAI,KAAK,CACb,sGAAsG,CACvG,CAAC;YACJ,CAAC;YAED,4CAA4C;YAC5C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;YAEvC,kCAAkC;YAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,gDAAgD,GAAG,MAAM,CAAC,CAAC;YAC7E,CAAC;YAED,qCAAqC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,oCAAoC,CAAC;YAE/F,wEAAwE;YACxE,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEpE,yBAAyB;YACzB,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;gBACtC,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,sCAAsC;gBACvD,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,EAAE,EAAE,WAAW;gBACf,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;gBAC7B,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,iCAAiC;gBACxE,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,mCAAmC;gBAC5E,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,kCAAkC;gBAC3E,GAAG,MAAM;aACV,CAAC,CAAC;YAEH,mBAAmB;YACnB,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;YAEnD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;gBACpC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,MAAM,EAAE,YAAY;oBACpB,YAAY,EAAE,4BAA4B;iBAC3C;aACF,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAEvE,sFAAsF;YACtF,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtC,MAAM,MAAM,GAAQ;oBAClB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI;oBACxB,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM;oBACzC,SAAS,EAAE,IAAI;iBAChB,CAAC;gBAEF,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,CAAC,OAAO,GAAG,sDAAsD,CAAC;gBAC1E,CAAC;qBAAM,CAAC;oBACN,iDAAiD;oBACjD,IAAI,KAAK,GAAG,CAAC,CAAC;oBACd,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;wBAC9C,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;wBACxC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;wBAC1C,KAAK,IAAI,CAAC,CAAC;oBACb,CAAC;oBACD,IAAI,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC7B,KAAK,IAAI,CAAC,CAAC;oBACb,CAAC;oBACD,IAAI,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;gBAED,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,MAAM;oBACN,KAAK,EAAE,IAAI;iBACZ,CAAC;YACJ,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;gBAExC,yCAAyC;gBACzC,MAAM,aAAa,GAA2B;oBAC5C,MAAM,EAAE,gFAAgF;oBACxF,MAAM,EAAE,oBAAoB;oBAC5B,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,uBAAuB;oBAC/B,MAAM,EAAE,oBAAoB;oBAC5B,MAAM,EAAE,oBAAoB;oBAC5B,MAAM,EAAE,sBAAsB;oBAC9B,MAAM,EAAE,2BAA2B;oBACnC,MAAM,EAAE,6CAA6C;oBACrD,MAAM,EAAE,mDAAmD;oBAC3D,MAAM,EAAE,kCAAkC;oBAC1C,MAAM,EAAE,iCAAiC;oBACzC,MAAM,EAAE,4BAA4B;oBACpC,MAAM,EAAE,sBAAsB;oBAC9B,MAAM,EAAE,sCAAsC;oBAC9C,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,2CAA2C;oBACnD,MAAM,EAAE,wBAAwB;oBAChC,MAAM,EAAE,8BAA8B;oBACtC,MAAM,EAAE,wBAAwB;oBAChC,MAAM,EAAE,6BAA6B;oBACrC,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,wBAAwB;oBAChC,MAAM,EAAE,yBAAyB;oBACjC,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,mCAAmC;oBAC3C,MAAM,EAAE,+BAA+B;iBACxC,CAAC;gBAEF,kCAAkC;gBAClC,IAAI,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,uBAAuB,SAAS,EAAE,CAAC;gBAC7E,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;oBACzB,OAAO,IAAI,kFAAkF,CAAC;gBAChG,CAAC;gBAED,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,SAAS;wBACf,OAAO;qBACR;iBACF,CAAC;YACJ,CAAC;YAED,sBAAsB;YACtB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,+CAA+C;oBACxD,QAAQ,EAAE,YAAY;iBACvB;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;AAEhD,gCAAgC;AAChC,kDAAkD;AAClD,iFAAiF;AACjF,qFAAqF;AAErF,0GAA0G;AAC1G,6EAA6E;AAE7E,kBAAkB;AAClB,EAAE;AACF,oCAAoC;AACpC,gCAAgC;AAChC,uBAAuB;AACvB,yBAAyB;AACzB,wBAAwB;AACxB,+BAA+B;AAC/B,mCAAmC;AACnC,0CAA0C;AAC1C,MAAM;AACN,EAAE;AACF,iCAAiC;AACjC,gCAAgC;AAChC,uBAAuB;AACvB,gBAAgB;AAChB,yBAAyB;AACzB,wBAAwB;AACxB,0BAA0B;AAC1B,MAAM;AACN,EAAE;AACF,0DAA0D;AAC1D,+CAA+C;AAC/C,qCAAqC;AACrC,wEAAwE;AAExE,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,MAAM,GAAG,GAAG,wCAAwC,CAAC;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAEpD,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACpC,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC;IAClD,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;AACH,CAAC"}

package/lib/worker/bulk-import.d.ts

@@ -1,3 +1,3 @@
 import { IWorkerAdapter } from '@unchainedshop/core';
-export declare const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>>;
+export declare const BulkImportWorker: IWorkerAdapter<any, Record<string, any>>;
 //# sourceMappingURL=bulk-import.d.ts.map

package/lib/worker/bulk-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAqDpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA8DzE,CAAC"}
+{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKpF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqErE,CAAC"}

package/lib/worker/bulk-import.js

@@ -1,35 +1,6 @@
 import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core';
 import { createLogger } from '@unchainedshop/logger';
-import JSONStream from 'JSONStream';
-import { EventIterator } from 'event-iterator';
-const logger = createLogger('unchained:worker:bulk-import');
-const streamPayloadToBulkImporter = async (bulkImporter, payloadId, unchainedAPI) => {
-    logger.trace(`parseAsync start`);
-    const readStream = await unchainedAPI.services.files.createDownloadStream({ fileId: payloadId });
-    if (!readStream) {
-        throw new Error('The current file adapter does not support streams when downloading required for streamed events. Please use a different file adapter.');
-    }
-    const eventIterator = new EventIterator((queue) => {
-        const jsonStream = JSONStream.parse('events.*'); // rows, ANYTHING, doc
-        jsonStream.on('data', queue.push);
-        jsonStream.on('close', queue.stop);
-        jsonStream.on('error', queue.fail);
-        queue.on('highWater', () => readStream.pause());
-        queue.on('lowWater', () => readStream.resume());
-        readStream.pipe(jsonStream);
-        readStream.on('error', queue.fail);
-        return () => {
-            jsonStream.removeListener('data', queue.push);
-            jsonStream.removeListener('close', queue.stop);
-            jsonStream.removeListener('error', queue.fail);
-            jsonStream.destroy();
-        };
-    }, { highWaterMark: 100, lowWaterMark: 5 });
-    for await (const event of eventIterator) {
-        await bulkImporter.prepare(event, unchainedAPI);
-    }
-    logger.trace(`parseAsync done`);
-};
+const logger = createLogger('unchained:bulk-import');
 export const BulkImportWorker = {
     ...WorkerAdapter,
     key: 'shop.unchained.worker-plugin.bulk-import',
@@ -47,7 +18,13 @@ export const BulkImportWorker = {
             });
             if (rawPayload.payloadId) {
                 // stream payload from gridfs
-                await streamPayloadToBulkImporter(bulkImporter, rawPayload.payloadId, unchainedAPI);
+                const readStream = await unchainedAPI.services.files.createDownloadStream({
+                    fileId: rawPayload.payloadId,
+                });
+                if (!readStream) {
+                    throw new Error('Could not create download stream from uploaded file');
+                }
+                await unchainedAPI.bulkImporter.pipeEventStream(readStream, bulkImporter, unchainedAPI);
             }
             else {
                 const { events } = rawPayload;
@@ -55,6 +32,7 @@ export const BulkImportWorker = {
                     throw new Error('No events submitted');
                 await events.reduce(async (currentEventPromise, nextEvent) => {
                     await currentEventPromise;
+                    await bulkImporter.validate(nextEvent);
                     return bulkImporter.prepare(nextEvent, unchainedAPI);
                 }, Promise.resolve());
             }
@@ -63,13 +41,13 @@ export const BulkImportWorker = {
             if (error) {
                 return {
                     success: false,
-                    result,
+                    result: result,
                     error,
                 };
             }
             return {
                 success: true,
-                result,
+                result: result,
             };
         }
         catch (err) {