@arcblock/payment-service 1.29.4 → 1.29.6

package/dist/index.js

@@ -376,6 +376,7 @@ __export(env_exports, {
   hasConfig: () => hasConfig,
   iapReconcileBatchSize: () => iapReconcileBatchSize,
   iapReconcileCronTime: () => iapReconcileCronTime,
+  isBlockletServer: () => isBlockletServer,
   isCfWorker: () => isCfWorker,
   isDevelopmentEnv: () => isDevelopmentEnv,
   isProduction: () => isProduction,
@@ -436,7 +437,7 @@ function hasConfig(key) {
   const v = readConfig(key);
   return v !== void 0 && v !== "";
 }
-var import_env, activeConfig, numConfig, paymentStatCronTime, subscriptionCronTime, notificationCronTime, expiredSessionCleanupCronTime, notificationCronConcurrency, stripeInvoiceCronTime, stripePaymentCronTime, stripeSubscriptionCronTime, revokeStakeCronTime, daysUntilCancel, meteringSubscriptionDetectionCronTime, overdueDetectionCronTime, overdueThreshold, depositVaultCronTime, creditConsumptionCronTime, vendorStatusCheckCronTime, vendorReturnScanCronTime, iapReconcileCronTime, eventRetryCronTime, quoteCleanupCronTime, vendorTimeoutMinutes, webhookAlertWindowMinutes, webhookAlertMinFailures, shortUrlApiKey, shortUrlDomain, sequelizeOptionsPoolMin, sequelizeOptionsPoolMax, sequelizeOptionsPoolIdle, updateDataConcurrency, stopAcceptingOrders, exchangeRateCacheTTLSeconds, systemMaxPendingAmount, allowChangeLockedPrice, blockletMode, isProduction, nodeEnv, isTestEnv, isDevelopmentEnv, enableDevFakeAuth, tenantModeRaw, blockletAppPid, blockletAppId, blockletAppName, blockletAppUrl, blockletAppHost, blockletAppDir, blockletPort, blockletMountPoints, appStoreWriteEnabled, appStoreSkipSignatureVerify, googlePubsubSkipSignatureVerify, googlePubsubPushServiceAccount, googlePubsubAllowUnverifiedSender, googlePlayWebhookUrl, stripeWebhookSecret, iapReconcileBatchSize, paymentBillingThreshold, paymentMinStakeAmount, paymentDaysUntilDue, paymentDaysUntilCancel, paymentReloadSubscriptionJobs, paymentRateVolatilityThreshold, paymentLivemode, creditLowBalanceThresholdPercentage, creditBatchSize, creditBatchWindowMs, creditQueueConcurrency, exchangeRateCacheTTLFromEnv, sqlLog, sqlBenchmark, cfEnv, isCfWorker, env_default;
+var import_env, activeConfig, numConfig, paymentStatCronTime, subscriptionCronTime, notificationCronTime, expiredSessionCleanupCronTime, notificationCronConcurrency, stripeInvoiceCronTime, stripePaymentCronTime, stripeSubscriptionCronTime, revokeStakeCronTime, daysUntilCancel, meteringSubscriptionDetectionCronTime, overdueDetectionCronTime, overdueThreshold, depositVaultCronTime, creditConsumptionCronTime, vendorStatusCheckCronTime, vendorReturnScanCronTime, iapReconcileCronTime, eventRetryCronTime, quoteCleanupCronTime, vendorTimeoutMinutes, webhookAlertWindowMinutes, webhookAlertMinFailures, shortUrlApiKey, shortUrlDomain, sequelizeOptionsPoolMin, sequelizeOptionsPoolMax, sequelizeOptionsPoolIdle, updateDataConcurrency, stopAcceptingOrders, exchangeRateCacheTTLSeconds, systemMaxPendingAmount, allowChangeLockedPrice, blockletMode, isProduction, nodeEnv, isTestEnv, isDevelopmentEnv, enableDevFakeAuth, tenantModeRaw, blockletAppPid, blockletAppId, blockletAppName, blockletAppUrl, blockletAppHost, blockletAppDir, blockletPort, blockletMountPoints, appStoreWriteEnabled, appStoreSkipSignatureVerify, googlePubsubSkipSignatureVerify, googlePubsubPushServiceAccount, googlePubsubAllowUnverifiedSender, googlePlayWebhookUrl, stripeWebhookSecret, iapReconcileBatchSize, paymentBillingThreshold, paymentMinStakeAmount, paymentDaysUntilDue, paymentDaysUntilCancel, paymentReloadSubscriptionJobs, paymentRateVolatilityThreshold, paymentLivemode, creditLowBalanceThresholdPercentage, creditBatchSize, creditBatchWindowMs, creditQueueConcurrency, exchangeRateCacheTTLFromEnv, sqlLog, sqlBenchmark, cfEnv, isCfWorker, isBlockletServer, env_default;
 var init_env = __esm({
   "../../blocklets/core/api/src/libs/env.ts"() {
     "use strict";
@@ -517,6 +518,7 @@ var init_env = __esm({
     sqlBenchmark = () => readConfig("SQL_BENCHMARK") === "1";
     cfEnv = () => globalThis.__CF_ENV__;
     isCfWorker = () => !!cfEnv();
+    isBlockletServer = () => hasConfig("BLOCKLET_APP_ID");
     env_default = {
       ...import_env.env
     };
@@ -1002,9 +1004,9 @@ function createNodeStaticHandler(webRoot) {
     throw new Error(`createNodeStaticHandler: webRoot has no index.html: ${indexPath}`);
   }
   let cachedIndex = null;
-  return (app42) => {
+  return (app43) => {
     const { serveStatic } = require("@hono/node-server/serve-static");
-    app42.use("*", async (c, next) => {
+    app43.use("*", async (c, next) => {
       const method = c.req.method.toUpperCase();
       if (method !== "GET" && method !== "HEAD" || !acceptsHtml(c.req.header("accept") || "") || import_constant.RESOURCE_PATTERN.test(c.req.path)) {
         return next();
@@ -1012,7 +1014,7 @@ function createNodeStaticHandler(webRoot) {
       if (cachedIndex == null) cachedIndex = import_fs.default.readFileSync(indexPath, "utf8");
       return c.html(cachedIndex);
     });
-    app42.use("*", serveStatic({ root: webRoot }));
+    app43.use("*", serveStatic({ root: webRoot }));
   };
 }
 var import_fs, import_path, import_constant, serve_static_arc_default;
@@ -16594,8 +16596,9 @@ function isCreditSufficientForPayment(args) {
   }
   return { sufficient: true, balance };
 }
-async function getGasPayerExtra(txBuffer, headers) {
-  if (headers && headers["x-gas-payer-sig"] && headers["x-gas-payer-pk"]) {
+async function getGasPayerExtra(txBuffer, headers, client) {
+  const appStaked = client ? await getAppStakeAddressWithFallback({ client }).then((r) => !!r).catch(() => false) : false;
+  if (!appStaked && headers && headers["x-gas-payer-sig"] && headers["x-gas-payer-pk"]) {
     return { headers };
   }
   const txHash = (0, import_mcrypto.toTxHash)(txBuffer);
@@ -22505,16 +22508,38 @@ var init_setting2 = __esm({
 });
 
 // ../../blocklets/core/api/src/libs/notification/index.ts
-var import_notification, Notification;
+var notification_exports = {};
+__export(notification_exports, {
+  Notification: () => Notification,
+  ensureBlockletSdkTransportGuard: () => ensureBlockletSdkTransportGuard
+});
+function noopSdkTransport(mod, fns) {
+  const noop = async () => void 0;
+  for (const target of [mod, mod?.default]) {
+    if (!target) continue;
+    for (const fn3 of fns) target[fn3] = noop;
+  }
+}
+function ensureBlockletSdkTransportGuard() {
+  if (blockletSdkTransportGuarded) return;
+  blockletSdkTransportGuarded = true;
+  if (isBlockletServer()) return;
+  noopSdkTransport(require("@blocklet/sdk/service/notification"), ["sendToUser", "sendToRelay", "sendToMail"]);
+  noopSdkTransport(require("@blocklet/sdk/service/eventbus"), ["publish", "subscribe", "unsubscribe"]);
+  logger_default.info("[blocklet-sdk] notification + eventbus transport disabled \u2014 no BLOCKLET_APP_ID (off blocklet-server)");
+}
+var import_notification, blockletSdkTransportGuarded, Notification;
 var init_notification = __esm({
   "../../blocklets/core/api/src/libs/notification/index.ts"() {
     "use strict";
     import_notification = __toESM(require("@blocklet/sdk/service/notification"));
     init_models();
     init_setting2();
+    init_env();
     init_logger();
     init_event2();
     init_audit();
+    blockletSdkTransportGuarded = false;
     Notification = class {
       constructor(template, type) {
         this.template = template;
@@ -32556,8 +32581,8 @@ var init_exchange_rate_alert = __esm({
 });
 
 // ../../blocklets/core/api/src/queues/notification.ts
-var notification_exports = {};
-__export(notification_exports, {
+var notification_exports2 = {};
+__export(notification_exports2, {
   addNotificationJob: () => addNotificationJob,
   addNotificationJobWithDelay: () => addNotificationJobWithDelay,
   aggregatedNotificationQueue: () => aggregatedNotificationQueue,
@@ -33637,6 +33662,45 @@ var init_subscription3 = __esm({
   }
 });
 
+// ../../blocklets/core/api/src/crons/tenant-fanout.ts
+async function listProvisionedTenants() {
+  const { PaymentMethod: PaymentMethod3 } = (init_models(), __toCommonJS(models_exports));
+  const rows = await systemFindAll(PaymentMethod3, {
+    attributes: ["instance_did"],
+    raw: true
+  });
+  const dids = /* @__PURE__ */ new Set();
+  for (const row of rows) {
+    if (row?.instance_did) dids.add(row.instance_did);
+  }
+  return [...dids];
+}
+function perTenant(name, fn3, listTenants = listProvisionedTenants) {
+  return async () => {
+    if (getTenantMode() === "single") {
+      await fn3();
+      return;
+    }
+    const dids = await listTenants();
+    if (dids.length === 0) return;
+    logger_default.info("cron.tenant.fanout", { cron: name, tenantCount: dids.length });
+    for (const instanceDid of dids) {
+      await withTenant(instanceDid, async () => fn3()).catch(
+        (error) => logger_default.error("cron tenant pass failed", { cron: name, instanceDid, error })
+      );
+    }
+  };
+}
+var init_tenant_fanout = __esm({
+  "../../blocklets/core/api/src/crons/tenant-fanout.ts"() {
+    "use strict";
+    init_context();
+    init_logger();
+    init_tenant();
+    init_scoped();
+  }
+});
+
 // ../../blocklets/core/api/src/integrations/stripe/handlers/invoice.ts
 async function handleStripeInvoicePaid(invoice, event) {
   logger_default.info("invoice paid on stripe event", { locale: invoice.id });
@@ -33829,7 +33893,7 @@ async function ensureStripeInvoice(stripeInvoice, subscription, client) {
   if (subscription) {
     await subscription.update({ latest_invoice_id: invoice.id });
   }
-  await client.invoices.update(stripeInvoice.id, { metadata: { appPid: import_env19.env.appPid, id: invoice.id } });
+  await client.invoices.update(stripeInvoice.id, { metadata: { appPid: import_env20.env.appPid, id: invoice.id } });
   logger_default.info("stripe invoice mirrored", { local: invoice.id, remote: stripeInvoice.id });
   await Promise.all(
     stripeInvoice.lines.data.map(async (line) => {
@@ -33887,7 +33951,7 @@ async function handleStripeInvoiceCreated(event, client) {
     logger_default.warn("abort because subscription not found", { id: event.id, type: event.type });
     return null;
   }
-  if (stripeSubscription.metadata?.appPid !== import_env19.env.appPid) {
+  if (stripeSubscription.metadata?.appPid !== import_env20.env.appPid) {
     logger_default.warn("abort because subscription not interested", { id: event.id, type: event.type });
     return null;
   }
@@ -33938,7 +34002,7 @@ async function handleInvoiceEvent(event, client) {
   const subscriptionAppPid = event.data.object.subscription_details?.metadata?.appPid;
   const autoRechargeConfigId = event.data.object.metadata?.recharge_id;
   if (!localInvoiceId) {
-    if (subscriptionId && subscriptionAppPid && subscriptionAppPid === import_env19.env.appPid) {
+    if (subscriptionId && subscriptionAppPid && subscriptionAppPid === import_env20.env.appPid) {
       logger_default.warn("try mirror invoice from stripe", { invoiceId: event.data.object.id });
       const subscription = await Subscription.findByPk(subscriptionId);
       if (subscription) {
@@ -34023,11 +34087,11 @@ async function handleInvoiceEvent(event, client) {
     }
   }
 }
-var import_env19, import_merge2, import_pick11, import_p_wait_for5, processInvoiceDiscounts, waitForStripeInvoiceMirrored;
+var import_env20, import_merge2, import_pick11, import_p_wait_for5, processInvoiceDiscounts, waitForStripeInvoiceMirrored;
 var init_invoice3 = __esm({
   "../../blocklets/core/api/src/integrations/stripe/handlers/invoice.ts"() {
     "use strict";
-    import_env19 = require("@blocklet/sdk/lib/env");
+    import_env20 = require("@blocklet/sdk/lib/env");
     import_merge2 = __toESM(require("lodash/merge"));
     import_pick11 = __toESM(require("lodash/pick"));
     import_p_wait_for5 = __toESM(require("p-wait-for"));
@@ -34153,7 +34217,7 @@ async function handleStripePaymentCreated(event, client) {
         stripe_id: stripeIntent.id
       }
     });
-    await client.paymentIntents.update(stripeIntent.id, { metadata: { appPid: import_env20.env.appPid, id: paymentIntent.id } });
+    await client.paymentIntents.update(stripeIntent.id, { metadata: { appPid: import_env21.env.appPid, id: paymentIntent.id } });
     await invoice.update({ payment_intent_id: paymentIntent.id });
     if (checkoutSession) {
       checkoutSession.update({ payment_intent_id: paymentIntent.id });
@@ -34220,11 +34284,11 @@ async function handlePaymentIntentEvent(event, client) {
     }
   }
 }
-var import_env20, import_merge3, import_pick12, import_p_wait_for6, waitForStripePaymentMirrored;
+var import_env21, import_merge3, import_pick12, import_p_wait_for6, waitForStripePaymentMirrored;
 var init_payment_intent2 = __esm({
   "../../blocklets/core/api/src/integrations/stripe/handlers/payment-intent.ts"() {
     "use strict";
-    import_env20 = require("@blocklet/sdk/lib/env");
+    import_env21 = require("@blocklet/sdk/lib/env");
     import_merge3 = __toESM(require("lodash/merge"));
     import_pick12 = __toESM(require("lodash/pick"));
     import_p_wait_for6 = __toESM(require("p-wait-for"));
@@ -34258,7 +34322,7 @@ async function ensureStripeProduct(internal, method) {
     name: internal.name,
     description: internal.description,
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       id: internal.id
     }
   };
@@ -34285,7 +34349,7 @@ async function ensureStripePrice(internal, method, currency) {
     lookup_key: internal.lookup_key,
     billing_scheme: internal.billing_scheme,
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       id: internal.id
     }
   };
@@ -34357,7 +34421,7 @@ async function ensureStripeCustomer(internal, method) {
     email: internal.email,
     phone: internal.phone,
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       id: internal.id,
       did: internal.did
     }
@@ -34396,7 +34460,7 @@ async function ensureStripePaymentIntent(internal, method, currency, checkoutSes
     const meta = stripeIntent.metadata || {};
     if (meta.id !== internal.id || checkoutSessionId && meta.checkoutSessionId !== checkoutSessionId) {
       stripeIntent = await client.paymentIntents.update(stripeIntent.id, {
-        metadata: { ...meta, appPid: import_env21.env.appPid, id: internal.id, checkoutSessionId: checkoutSessionId || "" }
+        metadata: { ...meta, appPid: import_env22.env.appPid, id: internal.id, checkoutSessionId: checkoutSessionId || "" }
       });
     }
   } else {
@@ -34410,7 +34474,7 @@ async function ensureStripePaymentIntent(internal, method, currency, checkoutSes
         allow_redirects: "never"
       },
       metadata: {
-        appPid: import_env21.env.appPid,
+        appPid: import_env22.env.appPid,
         id: internal.id,
         checkoutSessionId: checkoutSessionId || ""
       }
@@ -34481,7 +34545,7 @@ async function ensureStripeSubscription(internal, method, currency, items, trial
       payment_behavior: "default_incomplete",
       payment_settings: { save_default_payment_method: "on_subscription" },
       metadata: {
-        appPid: import_env21.env.appPid,
+        appPid: import_env22.env.appPid,
         id: internal.id
       },
       expand: ["latest_invoice.payment_intent", "pending_setup_intent"]
@@ -34511,7 +34575,7 @@ async function ensureStripeSubscription(internal, method, currency, items, trial
         });
         if (exist) {
           await exist.update({ metadata: { stripe_id: x.id, stripe_subscription_id: stripeSubscription.id } });
-          await client.subscriptionItems.update(x.id, { metadata: { appPid: import_env21.env.appPid, id: exist.id } });
+          await client.subscriptionItems.update(x.id, { metadata: { appPid: import_env22.env.appPid, id: exist.id } });
           logger_default.info("stripe subscription items related", { local: exist.id, remote: x.id });
         } else {
           exist = await SubscriptionItem.create({
@@ -34525,7 +34589,7 @@ async function ensureStripeSubscription(internal, method, currency, items, trial
               stripe_subscription_id: stripeSubscription.id
             }
           });
-          await client.subscriptionItems.update(x.id, { metadata: { appPid: import_env21.env.appPid, id: exist.id } });
+          await client.subscriptionItems.update(x.id, { metadata: { appPid: import_env22.env.appPid, id: exist.id } });
           logger_default.info("stripe subscription items mirrored", { local: exist.id, remote: x.id });
         }
       })
@@ -34685,7 +34749,7 @@ async function createStripeSubscriptionCoupon(localCoupon, subscriptionId, metho
     duration: localCoupon.duration,
     redeem_by: Math.floor(((/* @__PURE__ */ new Date()).getTime() + 24 * 60 * 60 * 1e3) / 1e3),
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       local_coupon_id: localCoupon.id,
       subscription_id: subscriptionId,
       created_for: "subscription"
@@ -34904,7 +34968,7 @@ async function ensureStripeSetupIntentForAutoRecharge(customer, method, autoRech
     payment_method_types: ["card"],
     usage: "off_session",
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       auto_recharge_config_id: autoRechargeConfig.id,
       customer_id: customer.id
     }
@@ -34924,7 +34988,7 @@ async function ensureStripeSetupIntentForInvoicePayment(customer, method, metada
     payment_method_types: ["card"],
     usage: "off_session",
     metadata: {
-      appPid: import_env21.env.appPid,
+      appPid: import_env22.env.appPid,
       customer_id: customer.id,
       action: "pay_overdue_batch",
       ...metadata
@@ -35052,7 +35116,7 @@ async function createStripeInvoiceForAutoRecharge(params) {
       auto_advance: true,
       default_payment_method: stripePaymentMethodId,
       metadata: {
-        appPid: import_env21.env.appPid,
+        appPid: import_env22.env.appPid,
         recharge_id: autoRechargeConfig.id,
         id: invoice.id
       }
@@ -35085,7 +35149,7 @@ async function createStripeInvoiceForAutoRecharge(params) {
         quantity: item.quantity,
         description: item.description || price.nickname || "",
         metadata: {
-          appPid: import_env21.env.appPid,
+          appPid: import_env22.env.appPid,
           invoice_item_id: item.id
         }
       });
@@ -35126,11 +35190,11 @@ async function createStripeInvoiceForAutoRecharge(params) {
     throw error;
   }
 }
-var import_env21, import_merge4, import_omit3, import_pick13, import_sequelize61;
+var import_env22, import_merge4, import_omit3, import_pick13, import_sequelize61;
 var init_resource2 = __esm({
   "../../blocklets/core/api/src/integrations/stripe/resource.ts"() {
     "use strict";
-    import_env21 = require("@blocklet/sdk/lib/env");
+    import_env22 = require("@blocklet/sdk/lib/env");
     import_merge4 = __toESM(require("lodash/merge"));
     import_omit3 = __toESM(require("lodash/omit"));
     import_pick13 = __toESM(require("lodash/pick"));
@@ -35159,6 +35223,8 @@ var init_invoice4 = __esm({
     "use strict";
     import_sequelize62 = require("sequelize");
     init_scoped();
+    init_context();
+    init_tenant_fanout();
     init_invoice2();
     init_audit();
     init_dayjs();
@@ -35357,22 +35423,25 @@ var init_invoice4 = __esm({
           }
         });
         const results = await Promise.allSettled(
-          invoices.map(async (x) => {
-            const supportAutoCharge = await PaymentMethod.supportAutoCharge(x.default_payment_method_id);
-            if (supportAutoCharge === false) {
-              return;
-            }
-            const exist = await invoiceQueue.get(x.id);
-            if (!exist) {
-              await invoiceQueue.push({ id: x.id, job: { invoiceId: x.id, retryOnError: true } });
-            }
+          invoices.map((x) => {
+            const dispatch = async () => {
+              const supportAutoCharge = await PaymentMethod.supportAutoCharge(x.default_payment_method_id);
+              if (supportAutoCharge === false) {
+                return;
+              }
+              const exist = await invoiceQueue.get(x.id);
+              if (!exist) {
+                await invoiceQueue.push({ id: x.id, job: { invoiceId: x.id, retryOnError: true } });
+              }
+            };
+            return x.instance_did ? withTenant(x.instance_did, dispatch) : dispatch();
           })
         );
         const failed = results.filter((r) => r.status === "rejected").length;
         if (failed > 0) {
           logger_default.warn(`Failed to process ${failed} invoices in startInvoiceQueue`);
         }
-        await batchHandleStripeInvoices();
+        await perTenant("startInvoiceQueue.stripe", batchHandleStripeInvoices)();
       } catch (error) {
         logger_default.error("Error in startInvoiceQueue:", error);
       } finally {
@@ -36929,6 +36998,8 @@ var init_subscription4 = __esm({
     import_sequelize65 = require("sequelize");
     init_env();
     init_scoped();
+    init_context();
+    init_tenant_fanout();
     init_audit();
     init_passport();
     init_resource2();
@@ -38165,34 +38236,37 @@ var init_subscription4 = __esm({
           }
         });
         const results = await Promise.allSettled(
-          subscriptions.map(async (x) => {
-            const supportAutoCharge = await PaymentMethod.supportAutoCharge(x.default_payment_method_id);
-            if (supportAutoCharge === false) {
-              return;
-            }
-            if (["past_due", "paused"].includes(x.status)) {
-              const willCancel = x.cancel_at || x.cancel_at_period_end;
-              if (x.status === "past_due" && willCancel) {
-                const existingJob = await subscriptionQueue.get(`cancel-${x.id}`);
-                if (!existingJob) {
-                  await addSubscriptionJob(x, "cancel", true, x.cancel_at || x.current_period_end);
+          subscriptions.map((x) => {
+            const dispatch = async () => {
+              const supportAutoCharge = await PaymentMethod.supportAutoCharge(x.default_payment_method_id);
+              if (supportAutoCharge === false) {
+                return;
+              }
+              if (["past_due", "paused"].includes(x.status)) {
+                const willCancel = x.cancel_at || x.cancel_at_period_end;
+                if (x.status === "past_due" && willCancel) {
+                  const existingJob = await subscriptionQueue.get(`cancel-${x.id}`);
+                  if (!existingJob) {
+                    await addSubscriptionJob(x, "cancel", true, x.cancel_at || x.current_period_end);
+                  }
                 }
+                logger_default.info(`skip add cycle subscription job because status is ${x.status}`, {
+                  subscription: x.id,
+                  action: "cycle"
+                });
+                return;
               }
-              logger_default.info(`skip add cycle subscription job because status is ${x.status}`, {
-                subscription: x.id,
-                action: "cycle"
-              });
-              return;
-            }
-            logger_default.info("add subscription job", { subscription: x.id, action: "cycle" });
-            await addSubscriptionJob(x, "cycle", paymentReloadSubscriptionJobs());
+              logger_default.info("add subscription job", { subscription: x.id, action: "cycle" });
+              await addSubscriptionJob(x, "cycle", paymentReloadSubscriptionJobs());
+            };
+            return x.instance_did ? withTenant(x.instance_did, dispatch) : dispatch();
           })
         );
         const failed = results.filter((r) => r.status === "rejected").length;
         if (failed > 0) {
           logger_default.warn(`Failed to process ${failed} subscriptions in startSubscriptionQueue`);
         }
-        await batchHandleStripeSubscriptions();
+        await perTenant("startSubscriptionQueue.stripe", batchHandleStripeSubscriptions)();
       } catch (error) {
         logger_default.error("Error in startSubscriptionQueue:", error);
       } finally {
@@ -39688,7 +39762,7 @@ async function executeSingleTransaction(client, claim, type, userDid, userPk, ga
   const { buffer: buffer2 } = await client[`encode${type}Tx`]({ tx });
   return client[`send${type}Tx`](
     { tx, wallet: (0, import_wallet2.fromPublicKey)(userPk, (0, import_did5.toTypeInfo)(userDid)) },
-    await getGasPayerExtra(buffer2, gasPayerHeaders)
+    await getGasPayerExtra(buffer2, gasPayerHeaders, client)
   );
 }
 async function executeOcapTransactions(userDid, userPk, claims, paymentMethod, requestSource, subscriptionId, paymentCurrencyContract, nonce) {
@@ -47111,11 +47185,11 @@ async function ensureWebhookRegistered() {
     }
     const stripe = method.getStripeClient();
     const { data } = await stripe.webhookEndpoints.list({ limit: 100 });
-    const exist = data.find((webhook) => webhook.metadata?.appPid === import_env28.env.appPid);
+    const exist = data.find((webhook) => webhook.metadata?.appPid === import_env29.env.appPid);
     if (exist) {
       await stripe.webhookEndpoints.update(exist.id, {
         url: STRIPE_ENDPOINT,
-        description: import_env28.env.appName,
+        description: import_env29.env.appName,
         enabled_events: STRIPE_EVENTS,
         disabled: false
       });
@@ -47123,11 +47197,11 @@ async function ensureWebhookRegistered() {
     } else {
       const result = await stripe.webhookEndpoints.create({
         url: STRIPE_ENDPOINT,
-        description: import_env28.env.appName,
+        description: import_env29.env.appName,
         enabled_events: STRIPE_EVENTS,
         api_version: STRIPE_API_VERSION,
         metadata: {
-          appPid: import_env28.env.appPid
+          appPid: import_env29.env.appPid
         }
       });
       logger_default.info("stripe webhook created");
@@ -47152,7 +47226,7 @@ async function validateStripeKeys(secretKey) {
 async function cleanupStripeWebhook(stripe) {
   try {
     const { data } = await stripe.webhookEndpoints.list({ limit: 100 });
-    const existingWebhook = data.find((webhook) => webhook.metadata?.appPid === import_env28.env.appPid);
+    const existingWebhook = data.find((webhook) => webhook.metadata?.appPid === import_env29.env.appPid);
     if (existingWebhook) {
       await stripe.webhookEndpoints.del(existingWebhook.id);
       logger_default.info("stripe webhook deleted", { id: existingWebhook.id });
@@ -47161,11 +47235,11 @@ async function cleanupStripeWebhook(stripe) {
     logger_default.error("Failed to clean old webhook:", err);
   }
 }
-var import_env28, import_stripe2;
+var import_env29, import_stripe2;
 var init_setup = __esm({
   "../../blocklets/core/api/src/integrations/stripe/setup.ts"() {
     "use strict";
-    import_env28 = require("@blocklet/sdk/lib/env");
+    import_env29 = require("@blocklet/sdk/lib/env");
     import_stripe2 = __toESM(require("stripe"));
     init_logger();
     init_util();
@@ -55200,6 +55274,7 @@ var init_credit_grant3 = __esm({
     init_dayjs();
     init_queue2();
     init_scoped();
+    init_context();
     init_models();
     init_event2();
     init_credit_grant2();
@@ -55292,7 +55367,8 @@ var init_credit_grant3 = __esm({
       });
       const invoiceResults = await Promise.allSettled(
         invoicesToSchedule.map(async (invoice) => {
-          await addInvoiceCreditJob(invoice.id);
+          const dispatch = () => addInvoiceCreditJob(invoice.id);
+          await (invoice.instance_did ? withTenant(invoice.instance_did, dispatch) : dispatch());
           return invoice.id;
         })
       );
@@ -55304,7 +55380,8 @@ var init_credit_grant3 = __esm({
       }
       const results = await Promise.allSettled(
         grantsToSchedule.map(async (grant) => {
-          await scheduleCreditGrantJobs(grant);
+          const dispatch = () => scheduleCreditGrantJobs(grant);
+          await (grant.instance_did ? withTenant(grant.instance_did, dispatch) : dispatch());
           return grant.id;
         })
       );
@@ -58006,12 +58083,12 @@ var init_handlers = __esm({
 });
 
 // ../../blocklets/core/api/src/routes/hono/integrations/stripe.ts
-var import_hono21, import_env33, import_get3, app21, verifyWebhookSig, handleEvent, stripe_default;
+var import_hono21, import_env34, import_get3, app21, verifyWebhookSig, handleEvent, stripe_default;
 var init_stripe = __esm({
   "../../blocklets/core/api/src/routes/hono/integrations/stripe.ts"() {
     "use strict";
     import_hono21 = require("hono");
-    import_env33 = require("@blocklet/sdk/lib/env");
+    import_env34 = require("@blocklet/sdk/lib/env");
     import_get3 = __toESM(require("lodash/get"));
     init_env();
     init_handlers();
@@ -58050,7 +58127,7 @@ var init_stripe = __esm({
         return c.json({ skipped: true });
       }
       const appPid = (0, import_get3.default)(stripeEvent, "data.object.metadata.appPid");
-      if (appPid && appPid !== import_env33.env.appPid) {
+      if (appPid && appPid !== import_env34.env.appPid) {
         logger_default.debug("webhook event for other app", { id: stripeEvent.id, type: stripeEvent.type });
         return c.json({ skipped: true });
       }
@@ -66597,6 +66674,49 @@ var init_archive2 = __esm({
   }
 });
 
+// ../../blocklets/core/api/src/routes/hono/bootstrap.ts
+var import_hono42, app42, authAdmin9, bootstrap_default;
+var init_bootstrap = __esm({
+  "../../blocklets/core/api/src/routes/hono/bootstrap.ts"() {
+    "use strict";
+    import_hono42 = require("hono");
+    init_security();
+    init_context();
+    init_auth();
+    init_stake();
+    init_models();
+    init_logger();
+    app42 = new import_hono42.Hono();
+    authAdmin9 = authenticate({ component: true, roles: ["owner", "admin"] });
+    app42.get("/", authAdmin9, async (c) => {
+      const instanceDid = getInstanceDid();
+      try {
+        const { bootstrapTenant: bootstrapTenant2 } = (init_service2(), __toCommonJS(service_exports));
+        await bootstrapTenant2(instanceDid);
+        const methods = await PaymentMethod.findAll({ where: { type: "arcblock", active: true } });
+        const chains = await Promise.all(
+          methods.map(async (method) => {
+            const host = method.settings?.arcblock?.api_host;
+            try {
+              const client = method.getOcapClient();
+              const { state } = await client.getAccountState({ address: wallet.address });
+              const stakedForGas = await hasStakedForGas(method);
+              return { method: method.name, host, declared: !!state, balance: state?.balance ?? null, stakedForGas };
+            } catch (err) {
+              return { method: method.name, host, error: err.message };
+            }
+          })
+        );
+        return c.json({ ok: true, instanceDid, appWallet: wallet.address, chains });
+      } catch (err) {
+        logger_default.error("bootstrap endpoint failed", { instanceDid, error: err });
+        return c.json({ ok: false, instanceDid, error: err.message }, 500);
+      }
+    });
+    bootstrap_default = app42;
+  }
+});
+
 // ../../blocklets/core/api/src/routes/hono/index.ts
 var hono_exports = {};
 __export(hono_exports, {
@@ -66647,6 +66767,7 @@ function mountMigratedResources(native, opts = {}) {
   g("/api/webhook-attempts", webhook_attempts_default);
   g("/api/webhook-endpoints", webhook_endpoints_default);
   g("/api/archive", archive_default);
+  g("/api/bootstrap", bootstrap_default);
 }
 var hono_default;
 var init_hono = __esm({
@@ -66694,6 +66815,7 @@ var init_hono = __esm({
     init_webhook_attempts();
     init_webhook_endpoints();
     init_archive2();
+    init_bootstrap();
     hono_default = mountMigratedResources;
   }
 });
@@ -67032,7 +67154,7 @@ var init_collect = __esm({
             const txHash = await client.sendTransferV3Tx(
               // @ts-ignore
               { tx, wallet: (0, import_wallet3.fromAddress)(userDid) },
-              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request))
+              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request), client)
             );
             await afterTxExecution({
               tx_hash: txHash,
@@ -67199,7 +67321,7 @@ var init_collect_batch = __esm({
           const txHash = await client.sendTransferV3Tx(
             // @ts-ignore
             { tx, wallet: (0, import_wallet4.fromAddress)(userDid) },
-            await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request))
+            await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request), client)
           );
           await afterTxExecution({ tx_hash: txHash, payer: userDid, type: "transfer" });
           return { hash: txHash };
@@ -67393,7 +67515,7 @@ var init_pay = __esm({
             const txHash = await client.sendTransferV3Tx(
               // @ts-ignore
               { tx, wallet: (0, import_wallet5.fromAddress)(userDid) },
-              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request))
+              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request), client)
             );
             const quoteValidation = await validateQuoteForPayment({
               checkoutSessionId: checkoutSession?.id,
@@ -68909,7 +69031,7 @@ var init_recharge = __esm({
             const txHash = await client.sendTransferV3Tx(
               // @ts-ignore
               { tx, wallet: (0, import_wallet6.fromAddress)(userDid) },
-              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request))
+              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request), client)
             );
             logger_default.info("Recharge successful", {
               receiverAddress,
@@ -69688,7 +69810,7 @@ var init_recharge_account = __esm({
             const txHash = await client.sendTransferV3Tx(
               // @ts-ignore
               { tx, wallet: (0, import_wallet7.fromAddress)(userDid) },
-              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request))
+              await getGasPayerExtra(buffer2, client.pickGasPayerHeaders(request), client)
             );
             await afterTxExecution({
               tx_hash: txHash,
@@ -71073,7 +71195,7 @@ async function startTokenTransferQueue() {
     logger_default.info("Found pending token transfers to process", { count: pendingTransactions.length });
     await Promise.all(
       pendingTransactions.map(async (transaction) => {
-        try {
+        const dispatch = async () => {
           const customer = await systemFindByPk(Customer, transaction.customer_id);
           const creditGrant = await systemFindByPk(CreditGrant, transaction.credit_grant_id);
           await addTokenTransferJob({
@@ -71085,6 +71207,9 @@ async function startTokenTransferQueue() {
             meterEventId: transaction.source,
             subscriptionId: transaction.subscription_id || void 0
           });
+        };
+        try {
+          await (transaction.instance_did ? withTenant(transaction.instance_did, dispatch) : dispatch());
         } catch (error) {
           logger_default.error("Failed to add pending transfer job", {
             transactionId: transaction.id,
@@ -71102,6 +71227,7 @@ var init_token_transfer = __esm({
   "../../blocklets/core/api/src/queues/token-transfer.ts"() {
     "use strict";
     import_util190 = require("@ocap/util");
+    init_context();
     init_logger();
     init_queue2();
     init_token2();
@@ -73727,6 +73853,7 @@ var init_status_check = __esm({
     "use strict";
     import_ufo15 = require("ufo");
     import_payment_vendor4 = require("@blocklet/payment-vendor");
+    init_context();
     init_queue2();
     init_checkout_session();
     init_models();
@@ -73744,17 +73871,26 @@ var init_status_check = __esm({
       }
       for (const checkoutSession of checkoutSessions) {
         const vendorInfo = checkoutSession.vendor_info;
-        if (!vendorInfo?.length) {
-          return;
-        }
-        for (const vendor of vendorInfo) {
-          if (vendor.status === "sent") {
-            vendorStatusCheckQueue.push({
-              id: `vendor-status-check-${checkoutSession.id}-${vendor.vendor_id}`,
-              job: {
-                checkoutSessionId: checkoutSession.id,
-                vendorId: vendor.vendor_id
+        if (vendorInfo?.length) {
+          const dispatch = () => {
+            for (const vendor of vendorInfo) {
+              if (vendor.status === "sent") {
+                vendorStatusCheckQueue.push({
+                  id: `vendor-status-check-${checkoutSession.id}-${vendor.vendor_id}`,
+                  job: {
+                    checkoutSessionId: checkoutSession.id,
+                    vendorId: vendor.vendor_id
+                  }
+                });
               }
+            }
+          };
+          try {
+            await (checkoutSession.instance_did ? withTenant(checkoutSession.instance_did, dispatch) : dispatch());
+          } catch (error) {
+            logger_default.error("startVendorStatusCheckSchedule: enqueue failed", {
+              checkoutSessionId: checkoutSession.id,
+              error
             });
           }
         }
@@ -74583,45 +74719,6 @@ var init_retry_pending_events = __esm({
   }
 });
 
-// ../../blocklets/core/api/src/crons/tenant-fanout.ts
-async function listProvisionedTenants() {
-  const { PaymentMethod: PaymentMethod3 } = (init_models(), __toCommonJS(models_exports));
-  const rows = await systemFindAll(PaymentMethod3, {
-    attributes: ["instance_did"],
-    raw: true
-  });
-  const dids = /* @__PURE__ */ new Set();
-  for (const row of rows) {
-    if (row?.instance_did) dids.add(row.instance_did);
-  }
-  return [...dids];
-}
-function perTenant(name, fn3, listTenants = listProvisionedTenants) {
-  return async () => {
-    if (getTenantMode() === "single") {
-      await fn3();
-      return;
-    }
-    const dids = await listTenants();
-    if (dids.length === 0) return;
-    logger_default.info("cron.tenant.fanout", { cron: name, tenantCount: dids.length });
-    for (const instanceDid of dids) {
-      await withTenant(instanceDid, async () => fn3()).catch(
-        (error) => logger_default.error("cron tenant pass failed", { cron: name, instanceDid, error })
-      );
-    }
-  };
-}
-var init_tenant_fanout = __esm({
-  "../../blocklets/core/api/src/crons/tenant-fanout.ts"() {
-    "use strict";
-    init_context();
-    init_logger();
-    init_tenant();
-    init_scoped();
-  }
-});
-
 // ../../blocklets/core/api/src/crons/subscription-trial-will-end.ts
 var import_dayjs45, import_sequelize110, SubscriptionTrialWillEndSchedule;
 var init_subscription_trial_will_end2 = __esm({
@@ -75505,7 +75602,10 @@ function init() {
       {
         name: "deposit.vault",
         time: depositVaultCronTime(),
-        fn: () => startDepositVaultQueue(),
+        // startDepositVaultQueue uses a SCOPED findAll (not systemFindAll), so it
+        // must run inside a tenant — perTenant fans it out per provisioned tenant
+        // (multi) or runs it once for the default tenant (single).
+        fn: perTenant("deposit.vault", () => startDepositVaultQueue()),
         options: { runOnInit: true }
       },
       {
@@ -75951,6 +76051,7 @@ var handleVendorCommission, vendorCommissionQueue, startVendorCommissionQueue;
 var init_commission = __esm({
   "../../blocklets/core/api/src/queues/vendors/commission.ts"() {
     "use strict";
+    init_context();
     init_event2();
     init_logger();
     init_queue2();
@@ -76027,13 +76128,23 @@ var init_commission = __esm({
           capture_method: "automatic"
         }
       });
-      payments.forEach(async (x) => {
-        const id = `vendor-commission-${x.invoice_id}`;
-        const exist = await vendorCommissionQueue.get(id);
-        if (!exist && x.invoice_id) {
-          vendorCommissionQueue.push({ id, job: { invoiceId: x.invoice_id, retryOnError: true } });
+      for (const x of payments) {
+        const invoiceId = x.invoice_id;
+        if (invoiceId) {
+          const dispatch = async () => {
+            const id = `vendor-commission-${invoiceId}`;
+            const exist = await vendorCommissionQueue.get(id);
+            if (!exist) {
+              vendorCommissionQueue.push({ id, job: { invoiceId, retryOnError: true } });
+            }
+          };
+          try {
+            await (x.instance_did ? withTenant(x.instance_did, dispatch) : dispatch());
+          } catch (error) {
+            logger_default.error("startVendorCommissionQueue: re-queue failed", { invoiceId, error });
+          }
         }
-      });
+      }
     };
     events.on("invoice.paid", async (invoice) => {
       try {
@@ -76851,6 +76962,7 @@ var init_discount_status = __esm({
   "../../blocklets/core/api/src/queues/discount-status.ts"() {
     "use strict";
     import_p_all8 = __toESM(require("p-all"));
+    init_context();
     init_queue2();
     init_models();
     init_logger();
@@ -76870,19 +76982,21 @@ var init_discount_status = __esm({
       logger_default.info("Starting discount status queue...");
       const coupons = await systemFindAll(Coupon, { where: { valid: true } });
       const promotionCodes = await systemFindAll(PromotionCode, { where: { active: true } });
+      const enqueue = (record, type, options) => async () => {
+        const dispatch = () => addDiscountStatusJob(record, type, false, options);
+        try {
+          await (record.instance_did ? withTenant(record.instance_did, dispatch) : dispatch());
+        } catch (error) {
+          logger_default.error("startDiscountStatusQueue: enqueue failed", { type, id: record.id, error });
+        }
+      };
       await (0, import_p_all8.default)(
-        coupons.map(
-          (coupon) => () => addDiscountStatusJob(coupon, "coupon", false, {
-            runAt: coupon.redeem_by
-          })
-        ),
+        coupons.map((coupon) => enqueue(coupon, "coupon", { runAt: coupon.redeem_by })),
         { concurrency: 5 }
       );
       await (0, import_p_all8.default)(
         promotionCodes.map(
-          (promotionCode) => () => addDiscountStatusJob(promotionCode, "promotion-code", false, {
-            runAt: promotionCode.expires_at
-          })
+          (promotionCode) => enqueue(promotionCode, "promotion-code", { runAt: promotionCode.expires_at })
         ),
         { concurrency: 5 }
       );
@@ -77037,13 +77151,18 @@ function contextMiddleware() {
       requestedBy = user4.did;
     }
     let instanceDid;
-    try {
-      instanceDid = await resolveTenantForHost(c.req.header("host"));
-    } catch (err) {
-      if (err instanceof TenantError && err.code === TENANT_HOST_UNRESOLVED) {
-        return c.json({ error: { code: err.code, message: err.message } }, 400);
+    const preResolved = context.peekInstanceDid();
+    if (preResolved) {
+      instanceDid = preResolved;
+    } else {
+      try {
+        instanceDid = await resolveTenantForHost(c.req.header("host"));
+      } catch (err) {
+        if (err instanceof TenantError && err.code === TENANT_HOST_UNRESOLVED) {
+          return c.json({ error: { code: err.code, message: err.message } }, 400);
+        }
+        throw err;
       }
-      throw err;
     }
     return context.run({ requestId, requestedBy, instanceDid }, async () => {
       await warmTenantIdentity(instanceDid);
@@ -77115,7 +77234,7 @@ var http_fetch_adapter_exports = {};
 __export(http_fetch_adapter_exports, {
   createFetchHandler: () => createFetchHandler
 });
-function createFetchHandler(app42) {
+function createFetchHandler(app43) {
   const handler = (async (request, opts) => {
     const url = new URL(request.url);
     const basePath = opts?.basePath ?? "";
@@ -77126,9 +77245,9 @@ function createFetchHandler(app42) {
       const body = hasBody ? await request.arrayBuffer() : void 0;
       const headers = new Headers(request.headers);
       if (!headers.has("x-path-prefix")) headers.set("x-path-prefix", basePath);
-      return app42.fetch(new Request(url.toString(), { method, headers, body }));
+      return app43.fetch(new Request(url.toString(), { method, headers, body }));
     }
-    return app42.fetch(request);
+    return app43.fetch(request);
   });
   handler.close = () => Promise.resolve();
   return handler;
@@ -77145,16 +77264,17 @@ __export(service_exports, {
   MissingConfigError: () => MissingConfigError,
   PaymentCoreSlotError: () => PaymentCoreSlotError,
   TenancySlotError: () => TenancySlotError,
+  bootstrapTenant: () => bootstrapTenant,
   buildConnectRoutesHono: () => buildConnectRoutesHono,
   buildHonoApp: () => buildHonoApp,
   createEmbeddedPaymentService: () => createEmbeddedPaymentService
 });
 function buildResourceRoutesHono() {
   const { mountMigratedResources: mountMigratedResources2 } = (init_hono(), __toCommonJS(hono_exports));
-  const app42 = new import_hono42.Hono();
-  app42.get("/api/healthz", (c) => c.json({ ok: true }));
-  mountMigratedResources2(app42);
-  return app42;
+  const app43 = new import_hono43.Hono();
+  app43.get("/api/healthz", (c) => c.json({ ok: true }));
+  mountMigratedResources2(app43);
+  return app43;
 }
 function connectHandlerModules() {
   return [
@@ -77176,7 +77296,7 @@ function connectHandlerModules() {
 }
 function buildConnectRoutesHono() {
   const { handlers: handlers2 } = (init_auth(), __toCommonJS(auth_exports));
-  const connectApp = new import_hono42.Hono();
+  const connectApp = new import_hono43.Hono();
   connectApp.use("*", async (c, next) => {
     const { context: requestCtx } = (init_context(), __toCommonJS(context_exports));
     if (requestCtx.peekInstanceDid()) return next();
@@ -77188,23 +77308,23 @@ function buildConnectRoutesHono() {
   return connectApp;
 }
 function buildHonoApp(configureNative, getConnectApp, attachStatic) {
-  const app42 = new import_hono42.Hono();
-  app42.onError((err, c) => {
+  const app43 = new import_hono43.Hono();
+  app43.onError((err, c) => {
     logger_default.error("handle router error", err);
     if (err instanceof import_error12.CustomError) {
       return c.json({ error: (0, import_error12.formatError)(err) }, (0, import_error12.getStatusFromError)(err));
     }
     return c.json({ error: err.message }, 500);
   });
-  app42.get("/api/healthz", (c) => c.json({ ok: true }));
-  const native = new import_hono42.Hono();
+  app43.get("/api/healthz", (c) => c.json({ ok: true }));
+  const native = new import_hono43.Hono();
   configureNative?.(native);
-  app42.route("/", native);
+  app43.route("/", native);
   if (getConnectApp) {
-    app42.route("/", getConnectApp());
+    app43.route("/", getConnectApp());
   }
-  attachStatic?.(app42);
-  return app42;
+  attachStatic?.(app43);
+  return app43;
 }
 function requireTenant() {
   return context.getInstanceDid();
@@ -77332,6 +77452,7 @@ async function startBackgroundServices() {
     return;
   }
   servicesStarted = true;
+  (init_notification(), __toCommonJS(notification_exports)).ensureBlockletSdkTransportGuard();
   const crons = (init_crons(), __toCommonJS(crons_exports)).default;
   const { initResourceHandler: initResourceHandler2 } = (init_resource4(), __toCommonJS(resource_exports2));
   const { initUserHandler: initUserHandler2 } = (init_user(), __toCommonJS(user_exports));
@@ -77346,7 +77467,7 @@ async function startBackgroundServices() {
     ["vendor fulfillment", (init_fulfillment2(), __toCommonJS(fulfillment_exports)).startVendorFulfillmentQueue],
     ["coordinated fulfillment", (init_fulfillment_coordinator(), __toCommonJS(fulfillment_coordinator_exports)).startCoordinatedFulfillmentQueue],
     ["checkoutSession", (init_checkout_session2(), __toCommonJS(checkout_session_exports)).startCheckoutSessionQueue],
-    ["notification", (init_notification3(), __toCommonJS(notification_exports)).startNotificationQueue],
+    ["notification", (init_notification3(), __toCommonJS(notification_exports2)).startNotificationQueue],
     ["refund", (init_refund3(), __toCommonJS(refund_exports)).startRefundQueue],
     ["credit", (init_credit_consume(), __toCommonJS(credit_consume_exports)).startCreditConsumeQueue],
     ["credit grant", (init_credit_grant3(), __toCommonJS(credit_grant_exports)).startCreditGrantQueue],
@@ -77355,7 +77476,7 @@ async function startBackgroundServices() {
     ["discount status", (init_discount_status(), __toCommonJS(discount_status_exports)).startDiscountStatusQueue]
   ];
   for (const [name, start] of starters) {
-    Promise.resolve(start()).then(() => logger_default.info(`${name} queue started`));
+    Promise.resolve(start()).then(() => logger_default.info(`${name} queue started`)).catch((error) => logger_default.error(`${name} queue failed to start`, { error }));
   }
   crons.init();
   initEventBroadcast2();
@@ -77512,12 +77633,12 @@ function createEmbeddedPaymentService(slots) {
     provisionTenant
   };
 }
-var import_error12, import_hono42, PaymentCoreSlotError, MissingConfigError, TenancySlotError, VALID_TENANT_MODES, servicesStarted, listInstanceDidsHook;
+var import_error12, import_hono43, PaymentCoreSlotError, MissingConfigError, TenancySlotError, VALID_TENANT_MODES, servicesStarted, listInstanceDidsHook;
 var init_service2 = __esm({
   "../../blocklets/core/api/src/service.ts"() {
     "use strict";
     import_error12 = require("@blocklet/error");
-    import_hono42 = require("hono");
+    import_hono43 = require("hono");
     init_env();
     init_logger();
     init_context();