@nvwa-app/sdk-functions 6.0.31 → 6.0.33

package/dist/index.d.mts

@@ -1,7 +1,6 @@
 import { drizzle } from 'drizzle-orm/postgres-js';
 
-declare function createDb(url: string): ReturnType<typeof drizzle>;
-declare function getDb(urlOverride?: string): ReturnType<typeof drizzle>;
+declare function getDb(): ReturnType<typeof drizzle>;
 
 interface AuthUser {
     id: string;
@@ -23,8 +22,8 @@ declare function getRequestUser(req: Request, baseUrlOverride?: string): Promise
 type PaymentPlatform = "web" | "uniapp" | "wechat-miniprogram";
 interface PaymentGatewayClientOptions {
     baseUrl: string;
-    token: string;
-    fetchImpl?: (input: string, init?: RequestInit) => Promise<Response>;
+    /** Project key (PAYMENT_PROJECT_KEY) for project-side auth; gateway validates via X-Payment-Project-Key */
+    projectKey: string;
 }
 interface CreateOrderParams {
     bizOrderId: string;
@@ -69,7 +68,7 @@ interface GetAvailableProvidersOptions {
     configured?: string[];
 }
 declare function getAvailableProviders(options?: GetAvailableProvidersOptions): string[];
-/** 单例：Functions 内 getPayment() 使用 env PAYMENT_GATEWAY_URL、PAYMENT_GATEWAY_INTERNAL_TOKEN。 */
+/** 单例：Functions 内 getPayment() 使用 env PAYMENT_GATEWAY_URL、PAYMENT_PROJECT_KEY。 */
 declare function getPayment(options?: PaymentGatewayClientOptions): PaymentGatewayClient;
 
-export { type AuthUser, type CreateOrderParams, type CreateOrderResult, type GetAvailableProvidersOptions, type GetOrderResult, type PaymentGatewayClient, type PaymentGatewayClientOptions, type PaymentPlatform, createDb, createPaymentClient, filterProvidersByPlatform, getAvailableProviders, getConfiguredProviders, getDb, getPayment, getRequestUser, providerSupportedPlatforms };
+export { type AuthUser, type CreateOrderParams, type CreateOrderResult, type GetAvailableProvidersOptions, type GetOrderResult, type PaymentGatewayClient, type PaymentGatewayClientOptions, type PaymentPlatform, createPaymentClient, filterProvidersByPlatform, getAvailableProviders, getConfiguredProviders, getDb, getPayment, getRequestUser, providerSupportedPlatforms };

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { drizzle } from 'drizzle-orm/postgres-js';
 
-declare function createDb(url: string): ReturnType<typeof drizzle>;
-declare function getDb(urlOverride?: string): ReturnType<typeof drizzle>;
+declare function getDb(): ReturnType<typeof drizzle>;
 
 interface AuthUser {
     id: string;
@@ -23,8 +22,8 @@ declare function getRequestUser(req: Request, baseUrlOverride?: string): Promise
 type PaymentPlatform = "web" | "uniapp" | "wechat-miniprogram";
 interface PaymentGatewayClientOptions {
     baseUrl: string;
-    token: string;
-    fetchImpl?: (input: string, init?: RequestInit) => Promise<Response>;
+    /** Project key (PAYMENT_PROJECT_KEY) for project-side auth; gateway validates via X-Payment-Project-Key */
+    projectKey: string;
 }
 interface CreateOrderParams {
     bizOrderId: string;
@@ -69,7 +68,7 @@ interface GetAvailableProvidersOptions {
     configured?: string[];
 }
 declare function getAvailableProviders(options?: GetAvailableProvidersOptions): string[];
-/** 单例：Functions 内 getPayment() 使用 env PAYMENT_GATEWAY_URL、PAYMENT_GATEWAY_INTERNAL_TOKEN。 */
+/** 单例：Functions 内 getPayment() 使用 env PAYMENT_GATEWAY_URL、PAYMENT_PROJECT_KEY。 */
 declare function getPayment(options?: PaymentGatewayClientOptions): PaymentGatewayClient;
 
-export { type AuthUser, type CreateOrderParams, type CreateOrderResult, type GetAvailableProvidersOptions, type GetOrderResult, type PaymentGatewayClient, type PaymentGatewayClientOptions, type PaymentPlatform, createDb, createPaymentClient, filterProvidersByPlatform, getAvailableProviders, getConfiguredProviders, getDb, getPayment, getRequestUser, providerSupportedPlatforms };
+export { type AuthUser, type CreateOrderParams, type CreateOrderResult, type GetAvailableProvidersOptions, type GetOrderResult, type PaymentGatewayClient, type PaymentGatewayClientOptions, type PaymentPlatform, createPaymentClient, filterProvidersByPlatform, getAvailableProviders, getConfiguredProviders, getDb, getPayment, getRequestUser, providerSupportedPlatforms };

package/dist/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  createDb: () => createDb,
   createPaymentClient: () => createPaymentClient,
   filterProvidersByPlatform: () => filterProvidersByPlatform,
   getAvailableProviders: () => getAvailableProviders,
@@ -56,15 +55,13 @@ function getEnv(key) {
 
 // src/db.ts
 function getDatabaseUrl() {
-  const url = getEnv("DATABASE_URL");
-  if (url) return url;
-  const user = getEnv("DB_USER");
-  const password = getEnv("DB_PASSWORD");
-  const endpoint = getEnv("DB_ENDPOINT");
-  const database = getEnv("DB_DATABASE");
+  const user = getEnv("PG_DB_USER");
+  const password = getEnv("PG_DB_PASSWORD");
+  const endpoint = getEnv("PG_DB_ENDPOINT");
+  const database = getEnv("PG_DB_DATABASE");
   if (!user || !password || !endpoint || !database) {
     throw new Error(
-      "Database config missing: set DATABASE_URL or DB_USER, DB_PASSWORD, DB_ENDPOINT, DB_DATABASE"
+      "Database config missing: set PG_DB_USER, PG_DB_PASSWORD, PG_DB_ENDPOINT, PG_DB_DATABASE"
     );
   }
   const safeUser = encodeURIComponent(user);
@@ -72,13 +69,8 @@ function getDatabaseUrl() {
   return `postgresql://${safeUser}:${safePassword}@${endpoint}/${database}`;
 }
 var _db = null;
-function createDb(url) {
-  const client = (0, import_postgres.default)(url, { max: 1 });
-  return (0, import_postgres_js.drizzle)(client);
-}
-function getDb(urlOverride) {
-  if (urlOverride) return createDb(urlOverride);
-  if (!_db) _db = createDb(getDatabaseUrl());
+function getDb() {
+  if (!_db) _db = (0, import_postgres_js.drizzle)((0, import_postgres.default)(getDatabaseUrl(), { max: 1 }));
   return _db;
 }
 
@@ -114,23 +106,22 @@ function resolveBaseUrl(explicit) {
   if (!url) throw new Error("PAYMENT_GATEWAY_URL is not set; payment gateway client requires it");
   return url.replace(/\/$/, "");
 }
-function resolveToken(explicit) {
-  const token = explicit ?? getEnv("PAYMENT_GATEWAY_INTERNAL_TOKEN");
-  if (!token) throw new Error("PAYMENT_GATEWAY_INTERNAL_TOKEN is not set; payment gateway client requires it");
-  return token;
-}
-function getDefaultFetch() {
-  if (typeof fetch === "function") return (input, init) => fetch(input, init);
-  throw new Error("Global fetch is not available; provide fetchImpl in PaymentGatewayClientOptions");
+function resolveProjectKey(explicit) {
+  const key = explicit ?? getEnv("PAYMENT_PROJECT_KEY");
+  if (!key) throw new Error("PAYMENT_PROJECT_KEY is not set; payment gateway client requires it");
+  return key;
 }
+var AUTH_HEADER = "X-Payment-Project-Key";
 function createPaymentClient(options) {
   const baseUrl = resolveBaseUrl(options?.baseUrl);
-  const token = resolveToken(options?.token);
-  const doFetch = options?.fetchImpl ?? getDefaultFetch();
+  const projectKey = resolveProjectKey(options?.projectKey);
+  const authHeaders = {
+    [AUTH_HEADER]: projectKey
+  };
   async function post(path, body) {
-    const res = await doFetch(`${baseUrl}${path}`, {
+    const res = await fetch(`${baseUrl}${path}`, {
       method: "POST",
-      headers: { "Content-Type": "application/json", "Authorization": `Bearer ${token}`, "X-Internal-Token": token },
+      headers: { "Content-Type": "application/json", ...authHeaders },
       body: JSON.stringify(body ?? {})
     });
     const text = await res.text();
@@ -146,9 +137,9 @@ function createPaymentClient(options) {
     return data.data;
   }
   async function get(path) {
-    const res = await doFetch(`${baseUrl}${path}`, {
+    const res = await fetch(`${baseUrl}${path}`, {
       method: "GET",
-      headers: { "Authorization": `Bearer ${token}`, "X-Internal-Token": token }
+      headers: authHeaders
     });
     const text = await res.text();
     let json;
@@ -221,7 +212,6 @@ function getPayment(options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createDb,
   createPaymentClient,
   filterProvidersByPlatform,
   getAvailableProviders,

package/dist/index.mjs

@@ -12,15 +12,13 @@ function getEnv(key) {
 
 // src/db.ts
 function getDatabaseUrl() {
-  const url = getEnv("DATABASE_URL");
-  if (url) return url;
-  const user = getEnv("DB_USER");
-  const password = getEnv("DB_PASSWORD");
-  const endpoint = getEnv("DB_ENDPOINT");
-  const database = getEnv("DB_DATABASE");
+  const user = getEnv("PG_DB_USER");
+  const password = getEnv("PG_DB_PASSWORD");
+  const endpoint = getEnv("PG_DB_ENDPOINT");
+  const database = getEnv("PG_DB_DATABASE");
   if (!user || !password || !endpoint || !database) {
     throw new Error(
-      "Database config missing: set DATABASE_URL or DB_USER, DB_PASSWORD, DB_ENDPOINT, DB_DATABASE"
+      "Database config missing: set PG_DB_USER, PG_DB_PASSWORD, PG_DB_ENDPOINT, PG_DB_DATABASE"
     );
   }
   const safeUser = encodeURIComponent(user);
@@ -28,13 +26,8 @@ function getDatabaseUrl() {
   return `postgresql://${safeUser}:${safePassword}@${endpoint}/${database}`;
 }
 var _db = null;
-function createDb(url) {
-  const client = postgres(url, { max: 1 });
-  return drizzle(client);
-}
-function getDb(urlOverride) {
-  if (urlOverride) return createDb(urlOverride);
-  if (!_db) _db = createDb(getDatabaseUrl());
+function getDb() {
+  if (!_db) _db = drizzle(postgres(getDatabaseUrl(), { max: 1 }));
   return _db;
 }
 
@@ -70,23 +63,22 @@ function resolveBaseUrl(explicit) {
   if (!url) throw new Error("PAYMENT_GATEWAY_URL is not set; payment gateway client requires it");
   return url.replace(/\/$/, "");
 }
-function resolveToken(explicit) {
-  const token = explicit ?? getEnv("PAYMENT_GATEWAY_INTERNAL_TOKEN");
-  if (!token) throw new Error("PAYMENT_GATEWAY_INTERNAL_TOKEN is not set; payment gateway client requires it");
-  return token;
-}
-function getDefaultFetch() {
-  if (typeof fetch === "function") return (input, init) => fetch(input, init);
-  throw new Error("Global fetch is not available; provide fetchImpl in PaymentGatewayClientOptions");
+function resolveProjectKey(explicit) {
+  const key = explicit ?? getEnv("PAYMENT_PROJECT_KEY");
+  if (!key) throw new Error("PAYMENT_PROJECT_KEY is not set; payment gateway client requires it");
+  return key;
 }
+var AUTH_HEADER = "X-Payment-Project-Key";
 function createPaymentClient(options) {
   const baseUrl = resolveBaseUrl(options?.baseUrl);
-  const token = resolveToken(options?.token);
-  const doFetch = options?.fetchImpl ?? getDefaultFetch();
+  const projectKey = resolveProjectKey(options?.projectKey);
+  const authHeaders = {
+    [AUTH_HEADER]: projectKey
+  };
   async function post(path, body) {
-    const res = await doFetch(`${baseUrl}${path}`, {
+    const res = await fetch(`${baseUrl}${path}`, {
       method: "POST",
-      headers: { "Content-Type": "application/json", "Authorization": `Bearer ${token}`, "X-Internal-Token": token },
+      headers: { "Content-Type": "application/json", ...authHeaders },
       body: JSON.stringify(body ?? {})
     });
     const text = await res.text();
@@ -102,9 +94,9 @@ function createPaymentClient(options) {
     return data.data;
   }
   async function get(path) {
-    const res = await doFetch(`${baseUrl}${path}`, {
+    const res = await fetch(`${baseUrl}${path}`, {
       method: "GET",
-      headers: { "Authorization": `Bearer ${token}`, "X-Internal-Token": token }
+      headers: authHeaders
     });
     const text = await res.text();
     let json;
@@ -176,7 +168,6 @@ function getPayment(options) {
   return _payment;
 }
 export {
-  createDb,
   createPaymentClient,
   filterProvidersByPlatform,
   getAvailableProviders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvwa-app/sdk-functions",
-  "version": "6.0.31",
+  "version": "6.0.33",
   "description": "NVWA Edge Functions SDK: db, payment gateway, auth, provider list. Use in Deno: import from 'npm:@nvwa-app/sdk-functions'.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",