@blocklet/payment-js 1.19.7 → 1.19.9

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import { ensureStart } from './resource';
 declare const _default: {
     checkout: {
         sessions: {
@@ -337,7 +338,7 @@ declare const _default: {
             subscription_id?: string;
             customer_id?: string;
             currency_id?: string;
-        }, data?: never) => Promise<import("./resources/meter-event").PendingAmountSummary>;
+        }, data?: never) => Promise<import("@blocklet/payment-types").GroupedBN>;
     };
     creditGrants: {
         create: (data: import("./resources/credit-grant").CreateCreditGrantData, params?: never) => Promise<import("@blocklet/payment-types").TCreditGrantExpanded>;
@@ -425,6 +426,8 @@ declare const _default: {
             message: string;
         }>;
     };
+    isPaymentRunning: () => boolean;
+    ensureStart: typeof ensureStart;
 };
 export default _default;
 export * from '@blocklet/payment-types';

package/lib/index.js

@@ -66,5 +66,7 @@ exports.default = {
     environments: resource_1.environments,
     refunds: refund_1.default,
     settings: setting_1.default,
+    isPaymentRunning: resource_1.isPaymentRunning,
+    ensureStart: resource_1.ensureStart,
 };
 __exportStar(require("@blocklet/payment-types"), exports);

package/lib/resource.d.ts

@@ -2,6 +2,7 @@ type MethodSpec = {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     path: string;
 };
+export declare const isPaymentRunning: () => boolean;
 export declare const environments: {
     getLivemode: () => boolean;
     setLivemode: (value: boolean) => void;
@@ -11,4 +12,5 @@ export declare const environments: {
 export declare function ensureComponentRunning(): Promise<void>;
 export declare function createResourceMethod<ResponseType = any, DataType = any, ParamType = any>(spec: MethodSpec): (_params: ParamType, data?: DataType) => Promise<ResponseType>;
 export declare function createResourceCreateMethod<ResponseType = any, DataType = any, ParamType = any>(spec: MethodSpec): (data: DataType, params?: ParamType) => Promise<ResponseType>;
+export declare function ensureStart(callback: () => void | Promise<void>, wait?: boolean): Promise<void>;
 export {};

package/lib/resource.js

@@ -1,15 +1,46 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.environments = void 0;
+exports.environments = exports.isPaymentRunning = void 0;
 exports.ensureComponentRunning = ensureComponentRunning;
 exports.createResourceMethod = createResourceMethod;
 exports.createResourceCreateMethod = createResourceCreateMethod;
+exports.ensureStart = ensureStart;
 /* eslint-disable import/prefer-default-export */
 const component_1 = __importDefault(require("@blocklet/sdk/lib/component"));
+const config_1 = __importStar(require("@blocklet/sdk/lib/config"));
+const notification_1 = __importDefault(require("@blocklet/sdk/lib/service/notification"));
+const constant_1 = require("@blocklet/constant");
 const PAYMENT_KIT_DID = 'z2qaCNvKMv5GjouKdcDWexv6WqtHbpNPQDnAk';
+const isPaymentRunning = () => {
+    return !!config_1.default.components.find((i) => i.did === PAYMENT_KIT_DID && i.status === constant_1.BlockletStatus.running);
+};
+exports.isPaymentRunning = isPaymentRunning;
 // global config
 let livemode = true;
 exports.environments = {
@@ -27,12 +58,18 @@ async function ensureComponentRunning() {
     if (running) {
         return;
     }
-    await component_1.default.waitForComponentRunning(PAYMENT_KIT_DID);
-    running = true;
+    running = (0, exports.isPaymentRunning)();
+    if (!running) {
+        await component_1.default.waitForComponentRunning(PAYMENT_KIT_DID);
+        running = true;
+    }
 }
 function createResourceMethod(spec) {
     return async (_params, data) => {
         await ensureComponentRunning();
+        if (!running) {
+            throw new Error('Payment Kit is not running. Please ensure the Payment Kit component is started.');
+        }
         const path = typeof _params === 'string' ? spec.path.replace('{id}', _params) : spec.path;
         const params = typeof _params === 'string' ? {} : _params;
         const result = await component_1.default.call({
@@ -48,6 +85,9 @@ function createResourceMethod(spec) {
 function createResourceCreateMethod(spec) {
     return async (data, params) => {
         await ensureComponentRunning();
+        if (!running) {
+            throw new Error('Payment Kit is not running. Please ensure the Payment Kit component is started.');
+        }
         const result = await component_1.default.call({
             name: PAYMENT_KIT_DID,
             method: spec.method,
@@ -58,3 +98,43 @@ function createResourceCreateMethod(spec) {
         return result.data;
     };
 }
+function setupAsyncComponentListener(callback) {
+    return new Promise((resolve) => {
+        const checkAndExecute = async ({ components }) => {
+            if (components.find((i) => i.did === PAYMENT_KIT_DID)) {
+                running = true;
+                config_1.logger.info('Payment Kit component started via notification in ensureStart');
+                notification_1.default.off(constant_1.BlockletInternalEvents.componentStarted, checkAndExecute);
+                try {
+                    await callback();
+                }
+                catch (error) {
+                    config_1.logger.error('Error executing callback in ensureStart:', error);
+                }
+                finally {
+                    resolve();
+                }
+            }
+        };
+        notification_1.default.on(constant_1.BlockletInternalEvents.componentStarted, checkAndExecute);
+    });
+}
+async function ensureStart(callback, wait = false) {
+    if (running) {
+        await callback();
+        return;
+    }
+    running = (0, exports.isPaymentRunning)();
+    if (running) {
+        await callback();
+        return;
+    }
+    if (wait) {
+        await component_1.default.waitForComponentRunning(PAYMENT_KIT_DID);
+        running = true;
+        await callback();
+        return;
+    }
+    config_1.logger.info('ensureStart: Payment Kit is not running, setting up async listener');
+    setupAsyncComponentListener(callback);
+}

package/lib/resources/meter-event.d.ts

@@ -1,4 +1,4 @@
-import type { Paginated, Pagination, TMeterEventExpanded } from '@blocklet/payment-types';
+import type { GroupedBN, Paginated, Pagination, TMeterEventExpanded } from '@blocklet/payment-types';
 export interface CreateMeterEventData {
     event_name: string;
     payload: {
@@ -16,11 +16,6 @@ export interface MeterEventStats {
     event_count: number;
     total_value: string;
 }
-export interface PendingAmountSummary {
-    currency_id: string;
-    total_pending: string;
-    count: number;
-}
 type ListParams = Pagination<{
     event_name?: string;
     meter_id?: string;
@@ -47,6 +42,6 @@ declare const _default: {
     retrieve: (_params: string, data?: never) => Promise<TMeterEventExpanded>;
     list: (_params: ListParams, data?: never) => Promise<Paginated<TMeterEventExpanded>>;
     stats: (_params: StatsParams, data?: never) => Promise<Paginated<MeterEventStats>>;
-    pendingAmount: (_params: PendingAmountParams, data?: never) => Promise<PendingAmountSummary>;
+    pendingAmount: (_params: PendingAmountParams, data?: never) => Promise<GroupedBN>;
 };
 export default _default;

package/lib/resources/meter.d.ts

@@ -22,6 +22,7 @@ export interface UpdateMeterData {
     description?: string;
     status?: 'active' | 'inactive';
     metadata?: Record<string, any>;
+    unit?: string;
 }
 type ListParams = Pagination<{
     event_name?: string;

package/lib/resources/setting.js

@@ -8,14 +8,14 @@ exports.default = {
     }),
     retrieve: (0, resource_1.createResourceMethod)({
         method: 'GET',
-        path: '/api/settings/{mountLocationOrId}',
+        path: '/api/settings/{id}',
     }),
     update: (0, resource_1.createResourceMethod)({
         method: 'PUT',
-        path: '/api/settings/{mountLocationOrId}',
+        path: '/api/settings/{id}',
     }),
     del: (0, resource_1.createResourceMethod)({
         method: 'DELETE',
-        path: '/api/settings/{mountLocationOrId}',
+        path: '/api/settings/{id}',
     }),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-js",
-  "version": "1.19.7",
+  "version": "1.19.9",
   "description": "Node.js client for Payment Kit",
   "keywords": [
     "types",
@@ -36,7 +36,8 @@
     "url": "https://github.com/blocklet/payment-kit/issues"
   },
   "dependencies": {
-    "@blocklet/payment-types": "1.19.7",
+    "@blocklet/constant": "^1.16.46",
+    "@blocklet/payment-types": "1.19.9",
     "@blocklet/sdk": "^1.16.46"
   },
   "importSort": {
@@ -63,5 +64,5 @@
     "type-fest": "^4.41.0",
     "typescript": "5.5.4"
   },
-  "gitHead": "83b0e5ac23d05e12d07929789f06f85b30929169"
+  "gitHead": "a65b166cee114b432be7c1e95b8ef7bc88b30fbd"
 }