@thirdweb-dev/service-utils 0.8.11-nightly-47c9c43a875a81aa357ebf3c741f256c317c5cfd-20250301025507 → 0.8.11-nightly-879148f37e61f12e40bdfd8844189944a4df9f83-20250301054921

package/dist/cjs/cf-worker/usageV2.js

@@ -1,41 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendUsageV2Events = sendUsageV2Events;
+const workers_types_1 = require("@cloudflare/workers-types");
+const index_js_1 = require("./index.js");
 /**
  * Send usageV2 events from either internal services or public clients.
  *
- * Exactly one authentication method must be provided:
- * - serviceKey: for internal services
- * - thirdwebClientId: for public clients (MUST be the user's project)
- * - thirdwebSecretKey: for public clients (MUST be the user's project)
- *
- * NOTE: `team_id` is required if `serviceKey` is provided.
- *
  * This method may throw. To call this non-blocking:
  * ```ts
  * void sendUsageV2Events(...).catch((e) => console.error(e))
  * ```
  */
 async function sendUsageV2Events(events, options) {
+    const { usageBaseUrl, source, authInput, serviceKey } = options;
+    const { clientId, secretKey } = await (0, index_js_1.extractAuthorizationData)(authInput);
+    // Forward headers from the origin request.
     // Determine endpoint and auth header based on provided credentials.
     let url;
-    const headers = { "Content-Type": "application/json" };
-    if (options.serviceKey) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}`;
-        headers["x-service-api-key"] = options.serviceKey;
+    const headers = new workers_types_1.Headers(authInput.req.headers);
+    headers.set("Content-Type", "application/json");
+    if (serviceKey) {
+        // If a service key is provided, call the non-public usage endpoint.
+        url = `${usageBaseUrl}/usage-v2/${source}`;
+        headers.set("x-service-api-key", serviceKey);
     }
-    else if (options.thirdwebSecretKey) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}/client`;
-        headers["x-secret-key"] = options.thirdwebSecretKey;
+    else if (clientId) {
+        url = `${usageBaseUrl}/usage-v2/${source}/client`;
+        headers.set("x-client-id", clientId);
     }
-    else if (options.thirdwebClientId) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}/client`;
-        headers["x-client-id"] = options.thirdwebClientId;
+    else if (secretKey) {
+        url = `${usageBaseUrl}/usage-v2/${source}/client`;
     }
     else {
         throw new Error("[UsageV2] No authentication method provided.");
     }
-    const resp = await fetch(url, {
+    const resp = await (0, workers_types_1.fetch)(url, {
         method: "POST",
         headers,
         body: JSON.stringify({ events }),

package/dist/cjs/cf-worker/usageV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":";;AA8BA,8CAmCC;AAlDD;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAgB,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;IAEpE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,EAAE,CAAC;QAC3D,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IACpD,CAAC;SAAM,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrC,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,SAAS,CAAC;QAClE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACtD,CAAC;SAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACpC,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,SAAS,CAAC;QAClE,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":";;AAwBA,8CAsCC;AA9DD,6DAAyE;AAOzE,yCAAsD;AAStD;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,mCAAwB,EAAC,SAAS,CAAC,CAAC;IAE1E,2CAA2C;IAC3C,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,IAAI,uBAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAK,EAAC,GAAG,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACjC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}

package/dist/esm/cf-worker/usageV2.js

@@ -1,33 +1,32 @@
+import { Headers, fetch } from "@cloudflare/workers-types";
+import { extractAuthorizationData } from "./index.js";
 /**
  * Send usageV2 events from either internal services or public clients.
  *
- * Exactly one authentication method must be provided:
- * - serviceKey: for internal services
- * - thirdwebClientId: for public clients (MUST be the user's project)
- * - thirdwebSecretKey: for public clients (MUST be the user's project)
- *
- * NOTE: `team_id` is required if `serviceKey` is provided.
- *
  * This method may throw. To call this non-blocking:
  * ```ts
  * void sendUsageV2Events(...).catch((e) => console.error(e))
  * ```
  */
 export async function sendUsageV2Events(events, options) {
+    const { usageBaseUrl, source, authInput, serviceKey } = options;
+    const { clientId, secretKey } = await extractAuthorizationData(authInput);
+    // Forward headers from the origin request.
     // Determine endpoint and auth header based on provided credentials.
     let url;
-    const headers = { "Content-Type": "application/json" };
-    if (options.serviceKey) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}`;
-        headers["x-service-api-key"] = options.serviceKey;
+    const headers = new Headers(authInput.req.headers);
+    headers.set("Content-Type", "application/json");
+    if (serviceKey) {
+        // If a service key is provided, call the non-public usage endpoint.
+        url = `${usageBaseUrl}/usage-v2/${source}`;
+        headers.set("x-service-api-key", serviceKey);
     }
-    else if (options.thirdwebSecretKey) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}/client`;
-        headers["x-secret-key"] = options.thirdwebSecretKey;
+    else if (clientId) {
+        url = `${usageBaseUrl}/usage-v2/${source}/client`;
+        headers.set("x-client-id", clientId);
     }
-    else if (options.thirdwebClientId) {
-        url = `${options.usageBaseUrl}/usage-v2/${options.source}/client`;
-        headers["x-client-id"] = options.thirdwebClientId;
+    else if (secretKey) {
+        url = `${usageBaseUrl}/usage-v2/${source}/client`;
     }
     else {
         throw new Error("[UsageV2] No authentication method provided.");

package/dist/esm/cf-worker/usageV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAgB,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;IAEpE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,EAAE,CAAC;QAC3D,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IACpD,CAAC;SAAM,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACrC,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,SAAS,CAAC;QAClE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACtD,CAAC;SAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACpC,GAAG,GAAG,GAAG,OAAO,CAAC,YAAY,aAAa,OAAO,CAAC,MAAM,SAAS,CAAC;QAClE,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAgB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAOzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAStD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAE1E,2CAA2C;IAC3C,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACjC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}

package/dist/types/cf-worker/usageV2.d.ts

@@ -1,30 +1,17 @@
+import { type Request } from "@cloudflare/workers-types";
+import type { CoreAuthInput } from "../core/types.js";
 import type { ClientUsageV2Event, UsageV2Event, UsageV2Source } from "../core/usageV2.js";
 type UsageV2Options = {
     usageBaseUrl: string;
     source: UsageV2Source;
-} & ({
-    serviceKey: string;
-    thirdwebClientId?: never;
-    thirdwebSecretKey?: never;
-} | {
-    serviceKey?: never;
-    thirdwebClientId: string;
-    thirdwebSecretKey?: never;
-} | {
-    serviceKey?: never;
-    thirdwebClientId?: never;
-    thirdwebSecretKey: string;
-});
+    authInput: CoreAuthInput & {
+        req: Request;
+    };
+    serviceKey?: string;
+};
 /**
  * Send usageV2 events from either internal services or public clients.
  *
- * Exactly one authentication method must be provided:
- * - serviceKey: for internal services
- * - thirdwebClientId: for public clients (MUST be the user's project)
- * - thirdwebSecretKey: for public clients (MUST be the user's project)
- *
- * NOTE: `team_id` is required if `serviceKey` is provided.
- *
  * This method may throw. To call this non-blocking:
  * ```ts
  * void sendUsageV2Events(...).catch((e) => console.error(e))

package/dist/types/cf-worker/usageV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usageV2.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,aAAa,CAAC;CACvB,GAAG,CACA;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,iBAAiB,CAAC,EAAE,KAAK,CAAA;CAAE,GAC3E;IAAE,UAAU,CAAC,EAAE,KAAK,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,KAAK,CAAA;CAAE,GAC3E;IAAE,UAAU,CAAC,EAAE,KAAK,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAC9E,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAC9D,MAAM,EAAE,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACpC,YAAY,EAAE,GACd,kBAAkB,EAAE,EACxB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,IAAI,CAAC,CA8Bf"}
+{"version":3,"file":"usageV2.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,OAAO,EAAS,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,aAAa,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAC9D,MAAM,EAAE,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACpC,YAAY,EAAE,GACd,kBAAkB,EAAE,EACxB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,IAAI,CAAC,CAiCf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/service-utils",
-  "version": "0.8.11-nightly-47c9c43a875a81aa357ebf3c741f256c317c5cfd-20250301025507",
+  "version": "0.8.11-nightly-879148f37e61f12e40bdfd8844189944a4df9f83-20250301054921",
   "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",