@zeroad.network/token 0.11.2 → 0.12.0

package/README.md

@@ -1,8 +1,8 @@
 ## Introduction
 
-**@zeroad.network/token** is a module meant to be used by partnering sites of [Zero Ad Network](https://zeroad.network) platform. It's a lightweight module that works on Nodejs 18 and above, and Bun 1.3 and above runtimes.
+**@zeroad.network/token** is a TypeScript ready module meant to be used by partnering sites of [Zero Ad Network](https://zeroad.network) platform. It's a lightweight module that works on Nodejs 18 and above, and Bun 1.3 and above runtimes.
 
-This node module allows a Zero Ad Network program partnering sites and Web APIs to verify determine if incoming web requests are coming from our browser extension users with active subscription.
+This module allows a Zero Ad Network program partnering sites and Web APIs to verify determine if incoming web requests are coming from our browser extension users with active subscription.
 
 Their browser extension will send the `X-Better-Web-Hello` Request Header which will let our module to verify it's our actively subscribed user and will allow your site to make a decision whether to disable ads, paywalls or enable access to otherwise paid content of yours.
 
@@ -20,7 +20,7 @@ In the second step of the Site registration process you'll be presented with you
 
 ## Module Installation
 
-This package works well within `mjs` (ESM) and `cjs` (CJS - older node versions) environments.
+As it is written in TypeScript, all types and interfaces are available. Also, this package works well in `mjs` (ESM) and `cjs` (CJS - older node versions) environments. You choose to either use `import` or `require()` statements. Imports are always preferred.
 
 Install this package using your favourite package manager:
 
@@ -28,10 +28,10 @@ Install this package using your favourite package manager:
 # npm
 npm add @zeroad.network/token
 
-# yarn
+# or yarn
 yarn add @zeroad.network/token
 
-# pnpm
+# or pnpm
 pnpm add @zeroad.network/token
 
 # or Bun
@@ -40,60 +40,62 @@ bun add @zeroad.network/token
 
 # Examples
 
-Take the example as a reference only. The most basic, and honestly, quite complete use with `express` v.5 could look similar to this:
+Take the simplest JavaScript example as a reference. The most basic, and honestly, quite complete use with `express` v.5 could look similar to this:
 
 ```js
 import express from "express";
-import {
-  init,
-  getServerHeaderName,
-  getServerHeaderValue,
-  processRequest,
-  getClientHeaderName,
-} from "@zeroad.network/token";
+import { ZeroAdNetwork } from "@zeroad.network/token";
 
 const app = express();
-const port = 3000;
 
+// Initialize your Zero Ad Network module
 // Welcome Header Value acquired during Site Registration process at Zero Ad Network platform
 const ZERO_AD_NETWORK_WELCOME_HEADER_VALUE = "AZqnKU56eIC7vCD1PPlwHg^1^3";
-
-// Initialize your Zero Ad Network module
-init({ value: ZERO_AD_NETWORK_WELCOME_HEADER_VALUE });
+const zeroAd = ZeroAdNetwork(ZERO_AD_NETWORK_WELCOME_HEADER_VALUE);
 
 app
   .use((req, res, next) => {
     // X-Better-Web-Welcome header injection can could have it's own simple middleware like this:
-    res.set(getServerHeaderName(), getServerHeaderValue());
+    res.set(zeroAd.SERVER_HEADER_NAME, zeroAd.SERVER_HEADER_VALUE);
 
-    next();
-  })
-  .use((req, res, next) => {
-    const tokenContext = processRequest(req.get(getClientHeaderName()));
-    res.locals.tokenContext = tokenContext;
+    // Process request token from incoming client token header value.
+    // And attach processed token info to request for downstream usage.
+    req.tokenContext = zeroAd.parseToken(req.get[zeroAd.CLIENT_HEADER_NAME]);
 
     next();
   })
   .get("/", (req, res) => {
-    // The "locals.disableAds" variable can now be used to suppress rendering
-    // of ads and 3rd party non-functional trackers.
-
-    // If "locals.shouldRemoveAds" value is true, the ads should be disabled in the template.
-
-    // If "locals.shouldEnablePremiumContentAccess" value is true, the access to paywalled content should be enabled. Depending on site subscription pricing, the basic subscription access could be enabled without forcing visitor to pay.
-
-    // If "locals.shouldEnableVipExperience" value is true, the next tier subscription access should be enabled without forcing visitor to pay.
-    res.render("index.ejs");
+    // For example:
+    console.log(req.tokenContext);
+
+    // Will produce the following structure:
+    req.tokenContext = {
+      // If set to true: Render no advertisements anywhere on the page
+      ADS_OFF: boolean,
+      // If set to true: Render no Cookie Consent screens (headers, footers or dialogs) on the page with complete OPT-OUT for non-functional trackers
+      COOKIE_CONSENT_OFF: boolean,
+      // If set to true: Render no marketing dialogs or popups such as newsletter, promotion etc. on the page
+      MARKETING_DIALOG_OFF: boolean,
+      // If set to true: Provide automatic access to otherwise paywalled content such as articles, news etc.
+      CONTENT_PAYWALL_OFF: boolean,
+      // If set to true: Provide automatic access to site features provided behind a SaaS at least the basic subscription plan
+      SUBSCRIPTION_ACCESS_ON: boolean,
+    };
+
+    // In your template adjust your content depending on tokenContext values
+    res.render("index.ejs", { tokenContext });
   });
 
+const port = 3000;
+
 app.listen(port, () => {
   console.log(`Server listening at http://localhost:${port}`);
 });
 ```
 
-For more example implementations such as `Express.js`, `Hono` or `Fastify`, please go to [see more examples](https://github.com/laurynas-karvelis/zeroad-token/tree/main/examples/).
+For all example implementations such as `Express.js` (JavaScript), `Hono` and `Fastify` (both are TypeScript), please go to [see more examples](https://github.com/laurynas-karvelis/zeroad-token-ts/tree/main/examples/).
 
-P.S.: Each web request coming from active subscriber using their Zero Ad Network browser extension will incur a tiny fraction of CPU computation cost to verify the token data matches its encrypted signature. On modern web infrastructure a request execution time will increase roughly by ~0.08ms to 0.2ms or so. Mileage might vary, but the impact is minimal.
+P.S.: Each web request coming from active subscriber using their Zero Ad Network browser extension will incur a tiny fraction of CPU computation cost to verify the token data matches its encrypted signature. On modern web infrastructure a request execution time will increase roughly by ~0.06ms to 0.2ms or so. Mileage might vary, but the impact is minimal.
 
 # Final thoughts
 

package/dist/{browser-CEwtQQBM.mjs → browser-ByaVwJr6.mjs}

@@ -1,10 +1,12 @@
 const ZEROAD_NETWORK_PUBLIC_KEY = "MCowBQYDK2VwAyEAignXRaTQtxEDl4ThULucKNQKEEO2Lo5bEO8qKwjSDVs=";
-var SITE_FEATURES = /* @__PURE__ */ ((SITE_FEATURES2) => {
-  SITE_FEATURES2[SITE_FEATURES2["AD_LESS_EXPERIENCE"] = 1] = "AD_LESS_EXPERIENCE";
-  SITE_FEATURES2[SITE_FEATURES2["PREMIUM_CONTENT_ACCESS"] = 2] = "PREMIUM_CONTENT_ACCESS";
-  SITE_FEATURES2[SITE_FEATURES2["VIP_EXPERIENCE"] = 4] = "VIP_EXPERIENCE";
-  return SITE_FEATURES2;
-})(SITE_FEATURES || {});
+var FEATURES = /* @__PURE__ */ ((FEATURES2) => {
+  FEATURES2[FEATURES2["ADS_OFF"] = 1] = "ADS_OFF";
+  FEATURES2[FEATURES2["COOKIE_CONSENT_OFF"] = 2] = "COOKIE_CONSENT_OFF";
+  FEATURES2[FEATURES2["MARKETING_DIALOG_OFF"] = 4] = "MARKETING_DIALOG_OFF";
+  FEATURES2[FEATURES2["CONTENT_PAYWALL_OFF"] = 8] = "CONTENT_PAYWALL_OFF";
+  FEATURES2[FEATURES2["SUBSCRIPTION_ACCESS_ON"] = 16] = "SUBSCRIPTION_ACCESS_ON";
+  return FEATURES2;
+})(FEATURES || {});
 var SERVER_HEADERS = /* @__PURE__ */ ((SERVER_HEADERS2) => {
   SERVER_HEADERS2["WELCOME"] = "X-Better-Web-Welcome";
   return SERVER_HEADERS2;
@@ -19,6 +21,12 @@ var PROTOCOL_VERSION = /* @__PURE__ */ ((PROTOCOL_VERSION2) => {
 })(PROTOCOL_VERSION || {});
 const CURRENT_PROTOCOL_VERSION = 1 /* V_1 */;
 
+let SITE_FEATURES_NATIVE$1;
+const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const getSiteFeaturesNative = () => {
+  if (SITE_FEATURES_NATIVE$1?.length) return SITE_FEATURES_NATIVE$1;
+  return SITE_FEATURES_NATIVE$1 = Object.entries(FEATURES).filter(([key]) => isNaN(Number(key)));
+};
 const toBase64 = (data) => {
   if (typeof data.toBase64 === "function") return data.toBase64();
   if (typeof Buffer !== "undefined") return Buffer.from(data).toString("base64");
@@ -65,15 +73,6 @@ const base64ToUuid = (input) => {
     hex.slice(20, 20 + 12)
   ].join("-");
 };
-const unixTimestampToBytes = (date) => {
-  const buffer = new ArrayBuffer(4);
-  new DataView(buffer).setUint32(0, Math.floor(date.getTime() / 1e3));
-  return new Uint8Array(buffer);
-};
-const bytesToUnixTimestamp = (bytes) => {
-  const u32int = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength).getUint32(0);
-  return new Date(u32int * 1e3);
-};
 const assert = (value, message) => {
   if (!value) throw new Error(message);
 };
@@ -99,15 +98,26 @@ function log(level, ...args) {
 }
 
 const SEPARATOR = "^";
+const SITE_FEATURES_NATIVE = getSiteFeaturesNative();
 class ServerHeader {
-  name = SERVER_HEADERS.WELCOME;
-  value;
+  NAME = SERVER_HEADERS.WELCOME.toLowerCase();
+  VALUE;
   constructor(options) {
-    if ("value" in options) {
-      this.value = options.value;
-    } else {
+    if (typeof options === "string") {
+      if (!options.length) {
+        throw new Error("ServerHeader: non-empty welcome header string value must be provided");
+      }
+      this.VALUE = options;
+    } else if (isObject(options) && "siteId" in options && "features" in options) {
       const { siteId, features } = options;
-      this.value = this.encode(siteId, features);
+      if (typeof siteId !== "string" || !siteId.length || !Array.isArray(features) || !features.length) {
+        throw new Error("ServerHeader options must be provided");
+      }
+      this.VALUE = this.encode(siteId, features);
+    } else {
+      throw new Error(
+        "ServerHeader: non-empty welcome header string value or { siteId, features } options must be provided"
+      );
     }
   }
   encode(siteId, features) {
@@ -127,12 +137,14 @@ class ServerHeader {
       );
       const siteId = base64ToUuid(encodedSiteId);
       assert(siteId.length === 36, "Invalid siteId value");
-      if (PROTOCOL_VERSION.V_1) {
-        assert([1, 2, 3, 4, 5, 6, 7].includes(Number(flags)), "Invalid flags value");
+      assert(Number(flags).toFixed(0).toString() === flags, "Invalid flags number");
+      let features = [];
+      for (const [feature, shift] of SITE_FEATURES_NATIVE) {
+        if (hasFeature(Number(flags), shift)) features.push(feature);
       }
       return {
         version: Number(protocolVersion),
-        flags: Number(flags),
+        features,
         siteId
       };
     } catch (err) {
@@ -141,4 +153,4 @@ class ServerHeader {
   }
 }
 
-export { CLIENT_HEADERS as C, PROTOCOL_VERSION as P, SITE_FEATURES as S, ZEROAD_NETWORK_PUBLIC_KEY as Z, ServerHeader as a, bytesToUnixTimestamp as b, setLogLevel as c, SERVER_HEADERS as d, CURRENT_PROTOCOL_VERSION as e, fromBase64 as f, hasFeature as h, log as l, setFeatures as s, toBase64 as t, unixTimestampToBytes as u };
+export { CLIENT_HEADERS as C, FEATURES as F, PROTOCOL_VERSION as P, ServerHeader as S, ZEROAD_NETWORK_PUBLIC_KEY as Z, setLogLevel as a, SERVER_HEADERS as b, CURRENT_PROTOCOL_VERSION as c, fromBase64 as f, getSiteFeaturesNative as g, hasFeature as h, log as l, setFeatures as s, toBase64 as t };

package/dist/{browser-DhviIs25.cjs → browser-C50SBRBw.cjs}

@@ -1,12 +1,14 @@
 'use strict';
 
 const ZEROAD_NETWORK_PUBLIC_KEY = "MCowBQYDK2VwAyEAignXRaTQtxEDl4ThULucKNQKEEO2Lo5bEO8qKwjSDVs=";
-var SITE_FEATURES = /* @__PURE__ */ ((SITE_FEATURES2) => {
-  SITE_FEATURES2[SITE_FEATURES2["AD_LESS_EXPERIENCE"] = 1] = "AD_LESS_EXPERIENCE";
-  SITE_FEATURES2[SITE_FEATURES2["PREMIUM_CONTENT_ACCESS"] = 2] = "PREMIUM_CONTENT_ACCESS";
-  SITE_FEATURES2[SITE_FEATURES2["VIP_EXPERIENCE"] = 4] = "VIP_EXPERIENCE";
-  return SITE_FEATURES2;
-})(SITE_FEATURES || {});
+var FEATURES = /* @__PURE__ */ ((FEATURES2) => {
+  FEATURES2[FEATURES2["ADS_OFF"] = 1] = "ADS_OFF";
+  FEATURES2[FEATURES2["COOKIE_CONSENT_OFF"] = 2] = "COOKIE_CONSENT_OFF";
+  FEATURES2[FEATURES2["MARKETING_DIALOG_OFF"] = 4] = "MARKETING_DIALOG_OFF";
+  FEATURES2[FEATURES2["CONTENT_PAYWALL_OFF"] = 8] = "CONTENT_PAYWALL_OFF";
+  FEATURES2[FEATURES2["SUBSCRIPTION_ACCESS_ON"] = 16] = "SUBSCRIPTION_ACCESS_ON";
+  return FEATURES2;
+})(FEATURES || {});
 var SERVER_HEADERS = /* @__PURE__ */ ((SERVER_HEADERS2) => {
   SERVER_HEADERS2["WELCOME"] = "X-Better-Web-Welcome";
   return SERVER_HEADERS2;
@@ -21,6 +23,12 @@ var PROTOCOL_VERSION = /* @__PURE__ */ ((PROTOCOL_VERSION2) => {
 })(PROTOCOL_VERSION || {});
 const CURRENT_PROTOCOL_VERSION = 1 /* V_1 */;
 
+let SITE_FEATURES_NATIVE$1;
+const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const getSiteFeaturesNative = () => {
+  if (SITE_FEATURES_NATIVE$1?.length) return SITE_FEATURES_NATIVE$1;
+  return SITE_FEATURES_NATIVE$1 = Object.entries(FEATURES).filter(([key]) => isNaN(Number(key)));
+};
 const toBase64 = (data) => {
   if (typeof data.toBase64 === "function") return data.toBase64();
   if (typeof Buffer !== "undefined") return Buffer.from(data).toString("base64");
@@ -67,15 +75,6 @@ const base64ToUuid = (input) => {
     hex.slice(20, 20 + 12)
   ].join("-");
 };
-const unixTimestampToBytes = (date) => {
-  const buffer = new ArrayBuffer(4);
-  new DataView(buffer).setUint32(0, Math.floor(date.getTime() / 1e3));
-  return new Uint8Array(buffer);
-};
-const bytesToUnixTimestamp = (bytes) => {
-  const u32int = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength).getUint32(0);
-  return new Date(u32int * 1e3);
-};
 const assert = (value, message) => {
   if (!value) throw new Error(message);
 };
@@ -101,15 +100,26 @@ function log(level, ...args) {
 }
 
 const SEPARATOR = "^";
+const SITE_FEATURES_NATIVE = getSiteFeaturesNative();
 class ServerHeader {
-  name = SERVER_HEADERS.WELCOME;
-  value;
+  NAME = SERVER_HEADERS.WELCOME.toLowerCase();
+  VALUE;
   constructor(options) {
-    if ("value" in options) {
-      this.value = options.value;
-    } else {
+    if (typeof options === "string") {
+      if (!options.length) {
+        throw new Error("ServerHeader: non-empty welcome header string value must be provided");
+      }
+      this.VALUE = options;
+    } else if (isObject(options) && "siteId" in options && "features" in options) {
       const { siteId, features } = options;
-      this.value = this.encode(siteId, features);
+      if (typeof siteId !== "string" || !siteId.length || !Array.isArray(features) || !features.length) {
+        throw new Error("ServerHeader options must be provided");
+      }
+      this.VALUE = this.encode(siteId, features);
+    } else {
+      throw new Error(
+        "ServerHeader: non-empty welcome header string value or { siteId, features } options must be provided"
+      );
     }
   }
   encode(siteId, features) {
@@ -129,12 +139,14 @@ class ServerHeader {
       );
       const siteId = base64ToUuid(encodedSiteId);
       assert(siteId.length === 36, "Invalid siteId value");
-      if (PROTOCOL_VERSION.V_1) {
-        assert([1, 2, 3, 4, 5, 6, 7].includes(Number(flags)), "Invalid flags value");
+      assert(Number(flags).toFixed(0).toString() === flags, "Invalid flags number");
+      let features = [];
+      for (const [feature, shift] of SITE_FEATURES_NATIVE) {
+        if (hasFeature(Number(flags), shift)) features.push(feature);
       }
       return {
         version: Number(protocolVersion),
-        flags: Number(flags),
+        features,
         siteId
       };
     } catch (err) {
@@ -145,16 +157,15 @@ class ServerHeader {
 
 exports.CLIENT_HEADERS = CLIENT_HEADERS;
 exports.CURRENT_PROTOCOL_VERSION = CURRENT_PROTOCOL_VERSION;
+exports.FEATURES = FEATURES;
 exports.PROTOCOL_VERSION = PROTOCOL_VERSION;
 exports.SERVER_HEADERS = SERVER_HEADERS;
-exports.SITE_FEATURES = SITE_FEATURES;
 exports.ServerHeader = ServerHeader;
 exports.ZEROAD_NETWORK_PUBLIC_KEY = ZEROAD_NETWORK_PUBLIC_KEY;
-exports.bytesToUnixTimestamp = bytesToUnixTimestamp;
 exports.fromBase64 = fromBase64;
+exports.getSiteFeaturesNative = getSiteFeaturesNative;
 exports.hasFeature = hasFeature;
 exports.log = log;
 exports.setFeatures = setFeatures;
 exports.setLogLevel = setLogLevel;
 exports.toBase64 = toBase64;
-exports.unixTimestampToBytes = unixTimestampToBytes;

package/dist/browser.d.cts

@@ -3,10 +3,17 @@
  * Used to verify `X-Better-Web-User` header values are not tampered with.
  */
 declare const ZEROAD_NETWORK_PUBLIC_KEY: string;
-declare enum SITE_FEATURES {
-    AD_LESS_EXPERIENCE = 1,
-    PREMIUM_CONTENT_ACCESS = 2,
-    VIP_EXPERIENCE = 4
+declare enum FEATURES {
+    /** Render no advertisements anywhere on the page */
+    ADS_OFF = 1,
+    /** Render no Cookie Consent screens (headers, footers or dialogs) on the page with complete OPT-OUT for non-functional trackers */
+    COOKIE_CONSENT_OFF = 2,
+    /** Render no marketing dialogs or popups such as newsletter, promotion etc. on the page */
+    MARKETING_DIALOG_OFF = 4,
+    /** Provide automatic access to otherwise paywalled content such as articles, news etc. */
+    CONTENT_PAYWALL_OFF = 8,
+    /** Provide automatic access to site features provided behind a SaaS at least the basic subscription plan */
+    SUBSCRIPTION_ACCESS_ON = 16
 }
 type UUID = string;
 declare enum SERVER_HEADERS {
@@ -19,35 +26,31 @@ declare enum PROTOCOL_VERSION {
     V_1 = 1
 }
 declare const CURRENT_PROTOCOL_VERSION = PROTOCOL_VERSION.V_1;
-type ServerHeaderSimpleOptions = {
-    value: string;
-};
 type ServerHeaderExtendedOptions = {
     siteId: UUID;
-    features: SITE_FEATURES[];
+    features: FEATURES[];
 };
-type ServerHeaderOptions = ServerHeaderExtendedOptions | ServerHeaderSimpleOptions;
+type ServerHeaderOptions = NonNullable<string | ServerHeaderExtendedOptions>;
 type WelcomeHeaderParseResult = WelcomeHeader | undefined;
 type WelcomeHeader = {
     version: PROTOCOL_VERSION;
+    features: (keyof typeof FEATURES)[];
     siteId: UUID;
-    flags: number;
 };
 type ClientHeaderParseResult = ClientParsedHeader | undefined;
 type ClientParsedHeader = {
     version: PROTOCOL_VERSION;
     expiresAt: Date;
-    expired: boolean;
     flags: number;
 };
 
 declare class ServerHeader {
-    name: SERVER_HEADERS;
-    value: string;
+    NAME: string;
+    VALUE: string;
     constructor(options: ServerHeaderOptions);
-    encode(siteId: UUID, features: SITE_FEATURES[]): string;
+    encode(siteId: UUID, features: FEATURES[]): string;
     static decode(headerValue: string | undefined): WelcomeHeaderParseResult;
 }
 
-export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, PROTOCOL_VERSION, SERVER_HEADERS, SITE_FEATURES, ServerHeader, ZEROAD_NETWORK_PUBLIC_KEY };
-export type { ClientHeaderParseResult, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderOptions, ServerHeaderSimpleOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult };
+export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, FEATURES, PROTOCOL_VERSION, SERVER_HEADERS, ServerHeader, ZEROAD_NETWORK_PUBLIC_KEY };
+export type { ClientHeaderParseResult, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult };

package/dist/browser.d.mts

@@ -3,10 +3,17 @@
  * Used to verify `X-Better-Web-User` header values are not tampered with.
  */
 declare const ZEROAD_NETWORK_PUBLIC_KEY: string;
-declare enum SITE_FEATURES {
-    AD_LESS_EXPERIENCE = 1,
-    PREMIUM_CONTENT_ACCESS = 2,
-    VIP_EXPERIENCE = 4
+declare enum FEATURES {
+    /** Render no advertisements anywhere on the page */
+    ADS_OFF = 1,
+    /** Render no Cookie Consent screens (headers, footers or dialogs) on the page with complete OPT-OUT for non-functional trackers */
+    COOKIE_CONSENT_OFF = 2,
+    /** Render no marketing dialogs or popups such as newsletter, promotion etc. on the page */
+    MARKETING_DIALOG_OFF = 4,
+    /** Provide automatic access to otherwise paywalled content such as articles, news etc. */
+    CONTENT_PAYWALL_OFF = 8,
+    /** Provide automatic access to site features provided behind a SaaS at least the basic subscription plan */
+    SUBSCRIPTION_ACCESS_ON = 16
 }
 type UUID = string;
 declare enum SERVER_HEADERS {
@@ -19,35 +26,31 @@ declare enum PROTOCOL_VERSION {
     V_1 = 1
 }
 declare const CURRENT_PROTOCOL_VERSION = PROTOCOL_VERSION.V_1;
-type ServerHeaderSimpleOptions = {
-    value: string;
-};
 type ServerHeaderExtendedOptions = {
     siteId: UUID;
-    features: SITE_FEATURES[];
+    features: FEATURES[];
 };
-type ServerHeaderOptions = ServerHeaderExtendedOptions | ServerHeaderSimpleOptions;
+type ServerHeaderOptions = NonNullable<string | ServerHeaderExtendedOptions>;
 type WelcomeHeaderParseResult = WelcomeHeader | undefined;
 type WelcomeHeader = {
     version: PROTOCOL_VERSION;
+    features: (keyof typeof FEATURES)[];
     siteId: UUID;
-    flags: number;
 };
 type ClientHeaderParseResult = ClientParsedHeader | undefined;
 type ClientParsedHeader = {
     version: PROTOCOL_VERSION;
     expiresAt: Date;
-    expired: boolean;
     flags: number;
 };
 
 declare class ServerHeader {
-    name: SERVER_HEADERS;
-    value: string;
+    NAME: string;
+    VALUE: string;
     constructor(options: ServerHeaderOptions);
-    encode(siteId: UUID, features: SITE_FEATURES[]): string;
+    encode(siteId: UUID, features: FEATURES[]): string;
     static decode(headerValue: string | undefined): WelcomeHeaderParseResult;
 }
 
-export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, PROTOCOL_VERSION, SERVER_HEADERS, SITE_FEATURES, ServerHeader, ZEROAD_NETWORK_PUBLIC_KEY };
-export type { ClientHeaderParseResult, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderOptions, ServerHeaderSimpleOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult };
+export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, FEATURES, PROTOCOL_VERSION, SERVER_HEADERS, ServerHeader, ZEROAD_NETWORK_PUBLIC_KEY };
+export type { ClientHeaderParseResult, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult };

package/dist/browser.mjs

@@ -1 +1 @@
-export { C as CLIENT_HEADERS, e as CURRENT_PROTOCOL_VERSION, P as PROTOCOL_VERSION, d as SERVER_HEADERS, S as SITE_FEATURES, a as ServerHeader, Z as ZEROAD_NETWORK_PUBLIC_KEY } from './browser-CEwtQQBM.mjs';
+export { C as CLIENT_HEADERS, c as CURRENT_PROTOCOL_VERSION, F as FEATURES, P as PROTOCOL_VERSION, b as SERVER_HEADERS, S as ServerHeader, Z as ZEROAD_NETWORK_PUBLIC_KEY } from './browser-ByaVwJr6.mjs';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var browser = require('./browser-DhviIs25.cjs');
+var browser = require('./browser-C50SBRBw.cjs');
 var crypto = require('crypto');
 
 const importPrivateKey = (privateKeyBase64) => {
@@ -30,30 +30,40 @@ const verify = (data, signature, publicKey) => {
 };
 const nonce = (size) => new Uint8Array(crypto.randomBytes(size));
 
+const VERSION_BYTES = 1;
 const NONCE_BYTES = 4;
 const SEPARATOR = ".";
+const SITE_FEATURES_NATIVE = browser.getSiteFeaturesNative();
+const as32BitNumber = (byteArray, begin) => {
+  const bytes = byteArray.subarray(begin, begin + Uint32Array.BYTES_PER_ELEMENT);
+  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+  return view.getUint32(0, true);
+};
 class ClientHeader {
   cryptoPublicKey;
   cryptoPrivateKey;
   publicKey;
   privateKey;
-  name = browser.CLIENT_HEADERS.HELLO;
+  NAME = browser.CLIENT_HEADERS.HELLO.toLowerCase();
   constructor(publicKey, privateKey) {
     this.publicKey = publicKey;
     this.privateKey = privateKey;
   }
-  encode(version, expiresAt, features) {
-    if (!this.privateKey) throw new Error("Private key is required");
-    const flags = browser.setFeatures(0, features);
-    const data = mergeByteArrays([
-      new Uint8Array([version]),
-      nonce(NONCE_BYTES),
-      browser.unixTimestampToBytes(expiresAt),
-      new Uint8Array([flags])
-    ]);
-    if (!this.cryptoPrivateKey) this.cryptoPrivateKey = importPrivateKey(this.privateKey);
-    const signature = sign(data.buffer, this.cryptoPrivateKey);
-    return [browser.toBase64(data), browser.toBase64(new Uint8Array(signature))].join(SEPARATOR);
+  parseToken(headerValue) {
+    const headerValueAsString = Array.isArray(headerValue) ? headerValue[0] : headerValue;
+    const data = this.decode(headerValueAsString);
+    const expired = !data || data.expiresAt.getTime() < Date.now();
+    const result = {};
+    if (!data || expired) {
+      for (const [feature] of SITE_FEATURES_NATIVE) {
+        result[feature] = false;
+      }
+      return result;
+    }
+    for (const [feature, shift] of SITE_FEATURES_NATIVE) {
+      result[feature] = browser.hasFeature(data.flags, shift);
+    }
+    return result;
   }
   decode(headerValue) {
     if (!headerValue?.length) return;
@@ -67,76 +77,60 @@ class ClientHeader {
       }
       const version = dataBytes[0];
       if (version === browser.PROTOCOL_VERSION.V_1) {
-        const flagsBytes = dataBytes.subarray(dataBytes.length - 1, dataBytes.length);
-        const expiresAtBytes = dataBytes.subarray(5, 9);
-        const expiresAt = browser.bytesToUnixTimestamp(expiresAtBytes);
-        const expired = expiresAt.getTime() < Date.now();
-        return { version, expiresAt, expired, flags: flagsBytes[0] };
+        const expiresAt = as32BitNumber(dataBytes, VERSION_BYTES + NONCE_BYTES);
+        const flags = as32BitNumber(dataBytes, dataBytes.length - Uint32Array.BYTES_PER_ELEMENT);
+        return { version, expiresAt: new Date(expiresAt * 1e3), flags };
       }
     } catch (err) {
       browser.log("warn", "Could not decode client header value", { reason: err?.message });
     }
   }
-  processRequest(headerValue) {
-    const data = this.decode(headerValue);
-    return {
-      _raw: data,
-      get shouldRemoveAds() {
-        return shouldRemoveAds(data);
-      },
-      get shouldEnablePremiumContentAccess() {
-        return shouldEnablePremiumContentAccess(data);
-      },
-      get shouldEnableVipExperience() {
-        return shouldEnableVipExperience(data);
-      }
-    };
+  encode(version, expiresAt, features) {
+    if (!this.privateKey) throw new Error("Private key is required");
+    const data = mergeByteArrays([
+      new Uint8Array([version]),
+      new Uint8Array(nonce(NONCE_BYTES)),
+      new Uint32Array([Math.floor(expiresAt.getTime() / 1e3)]),
+      new Uint32Array([browser.setFeatures(0, features)])
+    ]);
+    if (!this.cryptoPrivateKey) this.cryptoPrivateKey = importPrivateKey(this.privateKey);
+    const signature = sign(data.buffer, this.cryptoPrivateKey);
+    return [browser.toBase64(data), browser.toBase64(new Uint8Array(signature))].join(SEPARATOR);
   }
 }
-const test = (data, feature) => {
-  return data && !data?.expired && browser.hasFeature(data?.flags, feature) || false;
-};
-const shouldRemoveAds = (data) => test(data, browser.SITE_FEATURES.AD_LESS_EXPERIENCE);
-const shouldEnableVipExperience = (data) => test(data, browser.SITE_FEATURES.VIP_EXPERIENCE);
-const shouldEnablePremiumContentAccess = (data) => test(data, browser.SITE_FEATURES.PREMIUM_CONTENT_ACCESS);
 const mergeByteArrays = (arrays) => {
-  const totalLength = arrays.reduce((sum, arr) => sum + arr.length, 0);
+  const totalLength = arrays.reduce((sum, a) => sum + a.byteLength, 0);
   const data = new Uint8Array(totalLength);
   let offset = 0;
   for (const arr of arrays) {
-    data.set(arr, offset);
-    offset += arr.length;
+    let bytes;
+    if (arr instanceof Uint8Array) bytes = arr;
+    else if (arr instanceof Uint32Array) bytes = new Uint8Array(arr.buffer, arr.byteOffset, arr.byteLength);
+    else throw new Error("Unsupported type");
+    data.set(bytes, offset);
+    offset += bytes.byteLength;
   }
   return data;
 };
 
-class Site {
-  serverHeader;
-  clientHeader;
-  constructor(options) {
-    this.serverHeader = new browser.ServerHeader(options);
-    this.clientHeader = new ClientHeader(browser.ZEROAD_NETWORK_PUBLIC_KEY);
-  }
+function ZeroAdNetwork(options) {
+  const serverHeader = new browser.ServerHeader(options);
+  const clientHeader = new ClientHeader(browser.ZEROAD_NETWORK_PUBLIC_KEY);
+  return {
+    setLogLevel: browser.setLogLevel,
+    parseToken: clientHeader.parseToken.bind(clientHeader),
+    CLIENT_HEADER_NAME: clientHeader.NAME,
+    SERVER_HEADER_NAME: serverHeader.NAME,
+    SERVER_HEADER_VALUE: serverHeader.VALUE
+  };
 }
-let defaultSite;
-const init = (options) => defaultSite = new Site(options);
-const processRequest = (headerValue) => defaultSite.clientHeader.processRequest(headerValue);
-const getClientHeaderName = () => defaultSite.clientHeader.name;
-const getServerHeaderName = () => defaultSite.serverHeader.name;
-const getServerHeaderValue = () => defaultSite.serverHeader.value;
 
 exports.CLIENT_HEADERS = browser.CLIENT_HEADERS;
 exports.CURRENT_PROTOCOL_VERSION = browser.CURRENT_PROTOCOL_VERSION;
+exports.FEATURES = browser.FEATURES;
 exports.PROTOCOL_VERSION = browser.PROTOCOL_VERSION;
 exports.SERVER_HEADERS = browser.SERVER_HEADERS;
-exports.SITE_FEATURES = browser.SITE_FEATURES;
 exports.ServerHeader = browser.ServerHeader;
 exports.ZEROAD_NETWORK_PUBLIC_KEY = browser.ZEROAD_NETWORK_PUBLIC_KEY;
-exports.setLogLevel = browser.setLogLevel;
 exports.ClientHeader = ClientHeader;
-exports.Site = Site;
-exports.getClientHeaderName = getClientHeaderName;
-exports.getServerHeaderName = getServerHeaderName;
-exports.getServerHeaderValue = getServerHeaderValue;
-exports.init = init;
-exports.processRequest = processRequest;
+exports.ZeroAdNetwork = ZeroAdNetwork;

package/dist/index.d.cts

@@ -1,40 +1,27 @@
-import { CLIENT_HEADERS, PROTOCOL_VERSION, SITE_FEATURES, ClientHeaderParseResult, ServerHeader, ServerHeaderOptions, SERVER_HEADERS } from './browser.cjs';
-export { CURRENT_PROTOCOL_VERSION, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderSimpleOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult, ZEROAD_NETWORK_PUBLIC_KEY } from './browser.cjs';
+import { ClientHeaderParseResult, PROTOCOL_VERSION, FEATURES, ServerHeaderOptions } from './browser.cjs';
+export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, ClientParsedHeader, SERVER_HEADERS, ServerHeader, ServerHeaderExtendedOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult, ZEROAD_NETWORK_PUBLIC_KEY } from './browser.cjs';
 
 declare class ClientHeader {
     private cryptoPublicKey;
     private cryptoPrivateKey;
     private publicKey;
     private privateKey;
-    name: CLIENT_HEADERS;
+    NAME: string;
     constructor(publicKey: string, privateKey?: string);
-    encode(version: PROTOCOL_VERSION, expiresAt: Date, features: SITE_FEATURES[]): string;
-    decode(headerValue: string): ClientHeaderParseResult;
-    processRequest(headerValue: string | undefined): {
-        _raw: ClientHeaderParseResult;
-        readonly shouldRemoveAds: boolean;
-        readonly shouldEnablePremiumContentAccess: boolean;
-        readonly shouldEnableVipExperience: boolean;
-    };
+    parseToken(headerValue: string | string[] | undefined): Record<"ADS_OFF" | "COOKIE_CONSENT_OFF" | "MARKETING_DIALOG_OFF" | "CONTENT_PAYWALL_OFF" | "SUBSCRIPTION_ACCESS_ON", boolean>;
+    decode(headerValue: string | undefined): ClientHeaderParseResult;
+    encode(version: PROTOCOL_VERSION, expiresAt: Date, features: FEATURES[]): string;
 }
 
 type LogLevel = "error" | "warn" | "info" | "debug";
 declare function setLogLevel(level: LogLevel): void;
 
-declare class Site {
-    serverHeader: ServerHeader;
-    clientHeader: ClientHeader;
-    constructor(options: ServerHeaderOptions);
-}
-declare const init: (options: ServerHeaderOptions) => Site;
-declare const processRequest: (headerValue: string | undefined) => {
-    _raw: ClientHeaderParseResult;
-    readonly shouldRemoveAds: boolean;
-    readonly shouldEnablePremiumContentAccess: boolean;
-    readonly shouldEnableVipExperience: boolean;
+declare function ZeroAdNetwork(options: ServerHeaderOptions): {
+    setLogLevel: typeof setLogLevel;
+    parseToken: (headerValue: string | string[] | undefined) => Record<"ADS_OFF" | "COOKIE_CONSENT_OFF" | "MARKETING_DIALOG_OFF" | "CONTENT_PAYWALL_OFF" | "SUBSCRIPTION_ACCESS_ON", boolean>;
+    CLIENT_HEADER_NAME: string;
+    SERVER_HEADER_NAME: string;
+    SERVER_HEADER_VALUE: string;
 };
-declare const getClientHeaderName: () => CLIENT_HEADERS;
-declare const getServerHeaderName: () => SERVER_HEADERS;
-declare const getServerHeaderValue: () => string;
 
-export { CLIENT_HEADERS, ClientHeader, ClientHeaderParseResult, PROTOCOL_VERSION, SERVER_HEADERS, SITE_FEATURES, ServerHeader, ServerHeaderOptions, Site, getClientHeaderName, getServerHeaderName, getServerHeaderValue, init, processRequest, setLogLevel };
+export { ClientHeader, ClientHeaderParseResult, FEATURES, PROTOCOL_VERSION, ServerHeaderOptions, ZeroAdNetwork };

package/dist/index.d.mts

@@ -1,40 +1,27 @@
-import { CLIENT_HEADERS, PROTOCOL_VERSION, SITE_FEATURES, ClientHeaderParseResult, ServerHeader, ServerHeaderOptions, SERVER_HEADERS } from './browser.mjs';
-export { CURRENT_PROTOCOL_VERSION, ClientParsedHeader, ServerHeaderExtendedOptions, ServerHeaderSimpleOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult, ZEROAD_NETWORK_PUBLIC_KEY } from './browser.mjs';
+import { ClientHeaderParseResult, PROTOCOL_VERSION, FEATURES, ServerHeaderOptions } from './browser.mjs';
+export { CLIENT_HEADERS, CURRENT_PROTOCOL_VERSION, ClientParsedHeader, SERVER_HEADERS, ServerHeader, ServerHeaderExtendedOptions, UUID, WelcomeHeader, WelcomeHeaderParseResult, ZEROAD_NETWORK_PUBLIC_KEY } from './browser.mjs';
 
 declare class ClientHeader {
     private cryptoPublicKey;
     private cryptoPrivateKey;
     private publicKey;
     private privateKey;
-    name: CLIENT_HEADERS;
+    NAME: string;
     constructor(publicKey: string, privateKey?: string);
-    encode(version: PROTOCOL_VERSION, expiresAt: Date, features: SITE_FEATURES[]): string;
-    decode(headerValue: string): ClientHeaderParseResult;
-    processRequest(headerValue: string | undefined): {
-        _raw: ClientHeaderParseResult;
-        readonly shouldRemoveAds: boolean;
-        readonly shouldEnablePremiumContentAccess: boolean;
-        readonly shouldEnableVipExperience: boolean;
-    };
+    parseToken(headerValue: string | string[] | undefined): Record<"ADS_OFF" | "COOKIE_CONSENT_OFF" | "MARKETING_DIALOG_OFF" | "CONTENT_PAYWALL_OFF" | "SUBSCRIPTION_ACCESS_ON", boolean>;
+    decode(headerValue: string | undefined): ClientHeaderParseResult;
+    encode(version: PROTOCOL_VERSION, expiresAt: Date, features: FEATURES[]): string;
 }
 
 type LogLevel = "error" | "warn" | "info" | "debug";
 declare function setLogLevel(level: LogLevel): void;
 
-declare class Site {
-    serverHeader: ServerHeader;
-    clientHeader: ClientHeader;
-    constructor(options: ServerHeaderOptions);
-}
-declare const init: (options: ServerHeaderOptions) => Site;
-declare const processRequest: (headerValue: string | undefined) => {
-    _raw: ClientHeaderParseResult;
-    readonly shouldRemoveAds: boolean;
-    readonly shouldEnablePremiumContentAccess: boolean;
-    readonly shouldEnableVipExperience: boolean;
+declare function ZeroAdNetwork(options: ServerHeaderOptions): {
+    setLogLevel: typeof setLogLevel;
+    parseToken: (headerValue: string | string[] | undefined) => Record<"ADS_OFF" | "COOKIE_CONSENT_OFF" | "MARKETING_DIALOG_OFF" | "CONTENT_PAYWALL_OFF" | "SUBSCRIPTION_ACCESS_ON", boolean>;
+    CLIENT_HEADER_NAME: string;
+    SERVER_HEADER_NAME: string;
+    SERVER_HEADER_VALUE: string;
 };
-declare const getClientHeaderName: () => CLIENT_HEADERS;
-declare const getServerHeaderName: () => SERVER_HEADERS;
-declare const getServerHeaderValue: () => string;
 
-export { CLIENT_HEADERS, ClientHeader, ClientHeaderParseResult, PROTOCOL_VERSION, SERVER_HEADERS, SITE_FEATURES, ServerHeader, ServerHeaderOptions, Site, getClientHeaderName, getServerHeaderName, getServerHeaderValue, init, processRequest, setLogLevel };
+export { ClientHeader, ClientHeaderParseResult, FEATURES, PROTOCOL_VERSION, ServerHeaderOptions, ZeroAdNetwork };

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { C as CLIENT_HEADERS, s as setFeatures, u as unixTimestampToBytes, t as toBase64, f as fromBase64, P as PROTOCOL_VERSION, b as bytesToUnixTimestamp, l as log, S as SITE_FEATURES, h as hasFeature, a as ServerHeader, Z as ZEROAD_NETWORK_PUBLIC_KEY } from './browser-CEwtQQBM.mjs';
-export { e as CURRENT_PROTOCOL_VERSION, d as SERVER_HEADERS, c as setLogLevel } from './browser-CEwtQQBM.mjs';
-import { randomBytes, createPrivateKey, sign as sign$1, createPublicKey, verify as verify$1 } from 'crypto';
+import { g as getSiteFeaturesNative, C as CLIENT_HEADERS, h as hasFeature, f as fromBase64, P as PROTOCOL_VERSION, l as log, s as setFeatures, t as toBase64, S as ServerHeader, a as setLogLevel, Z as ZEROAD_NETWORK_PUBLIC_KEY } from './browser-ByaVwJr6.mjs';
+export { c as CURRENT_PROTOCOL_VERSION, F as FEATURES, b as SERVER_HEADERS } from './browser-ByaVwJr6.mjs';
+import { createPublicKey, verify as verify$1, randomBytes, createPrivateKey, sign as sign$1 } from 'crypto';
 
 const importPrivateKey = (privateKeyBase64) => {
   const keyBuffer = Buffer.from(privateKeyBase64, "base64");
@@ -29,30 +29,40 @@ const verify = (data, signature, publicKey) => {
 };
 const nonce = (size) => new Uint8Array(randomBytes(size));
 
+const VERSION_BYTES = 1;
 const NONCE_BYTES = 4;
 const SEPARATOR = ".";
+const SITE_FEATURES_NATIVE = getSiteFeaturesNative();
+const as32BitNumber = (byteArray, begin) => {
+  const bytes = byteArray.subarray(begin, begin + Uint32Array.BYTES_PER_ELEMENT);
+  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+  return view.getUint32(0, true);
+};
 class ClientHeader {
   cryptoPublicKey;
   cryptoPrivateKey;
   publicKey;
   privateKey;
-  name = CLIENT_HEADERS.HELLO;
+  NAME = CLIENT_HEADERS.HELLO.toLowerCase();
   constructor(publicKey, privateKey) {
     this.publicKey = publicKey;
     this.privateKey = privateKey;
   }
-  encode(version, expiresAt, features) {
-    if (!this.privateKey) throw new Error("Private key is required");
-    const flags = setFeatures(0, features);
-    const data = mergeByteArrays([
-      new Uint8Array([version]),
-      nonce(NONCE_BYTES),
-      unixTimestampToBytes(expiresAt),
-      new Uint8Array([flags])
-    ]);
-    if (!this.cryptoPrivateKey) this.cryptoPrivateKey = importPrivateKey(this.privateKey);
-    const signature = sign(data.buffer, this.cryptoPrivateKey);
-    return [toBase64(data), toBase64(new Uint8Array(signature))].join(SEPARATOR);
+  parseToken(headerValue) {
+    const headerValueAsString = Array.isArray(headerValue) ? headerValue[0] : headerValue;
+    const data = this.decode(headerValueAsString);
+    const expired = !data || data.expiresAt.getTime() < Date.now();
+    const result = {};
+    if (!data || expired) {
+      for (const [feature] of SITE_FEATURES_NATIVE) {
+        result[feature] = false;
+      }
+      return result;
+    }
+    for (const [feature, shift] of SITE_FEATURES_NATIVE) {
+      result[feature] = hasFeature(data.flags, shift);
+    }
+    return result;
   }
   decode(headerValue) {
     if (!headerValue?.length) return;
@@ -66,62 +76,52 @@ class ClientHeader {
       }
       const version = dataBytes[0];
       if (version === PROTOCOL_VERSION.V_1) {
-        const flagsBytes = dataBytes.subarray(dataBytes.length - 1, dataBytes.length);
-        const expiresAtBytes = dataBytes.subarray(5, 9);
-        const expiresAt = bytesToUnixTimestamp(expiresAtBytes);
-        const expired = expiresAt.getTime() < Date.now();
-        return { version, expiresAt, expired, flags: flagsBytes[0] };
+        const expiresAt = as32BitNumber(dataBytes, VERSION_BYTES + NONCE_BYTES);
+        const flags = as32BitNumber(dataBytes, dataBytes.length - Uint32Array.BYTES_PER_ELEMENT);
+        return { version, expiresAt: new Date(expiresAt * 1e3), flags };
       }
     } catch (err) {
       log("warn", "Could not decode client header value", { reason: err?.message });
     }
   }
-  processRequest(headerValue) {
-    const data = this.decode(headerValue);
-    return {
-      _raw: data,
-      get shouldRemoveAds() {
-        return shouldRemoveAds(data);
-      },
-      get shouldEnablePremiumContentAccess() {
-        return shouldEnablePremiumContentAccess(data);
-      },
-      get shouldEnableVipExperience() {
-        return shouldEnableVipExperience(data);
-      }
-    };
+  encode(version, expiresAt, features) {
+    if (!this.privateKey) throw new Error("Private key is required");
+    const data = mergeByteArrays([
+      new Uint8Array([version]),
+      new Uint8Array(nonce(NONCE_BYTES)),
+      new Uint32Array([Math.floor(expiresAt.getTime() / 1e3)]),
+      new Uint32Array([setFeatures(0, features)])
+    ]);
+    if (!this.cryptoPrivateKey) this.cryptoPrivateKey = importPrivateKey(this.privateKey);
+    const signature = sign(data.buffer, this.cryptoPrivateKey);
+    return [toBase64(data), toBase64(new Uint8Array(signature))].join(SEPARATOR);
   }
 }
-const test = (data, feature) => {
-  return data && !data?.expired && hasFeature(data?.flags, feature) || false;
-};
-const shouldRemoveAds = (data) => test(data, SITE_FEATURES.AD_LESS_EXPERIENCE);
-const shouldEnableVipExperience = (data) => test(data, SITE_FEATURES.VIP_EXPERIENCE);
-const shouldEnablePremiumContentAccess = (data) => test(data, SITE_FEATURES.PREMIUM_CONTENT_ACCESS);
 const mergeByteArrays = (arrays) => {
-  const totalLength = arrays.reduce((sum, arr) => sum + arr.length, 0);
+  const totalLength = arrays.reduce((sum, a) => sum + a.byteLength, 0);
   const data = new Uint8Array(totalLength);
   let offset = 0;
   for (const arr of arrays) {
-    data.set(arr, offset);
-    offset += arr.length;
+    let bytes;
+    if (arr instanceof Uint8Array) bytes = arr;
+    else if (arr instanceof Uint32Array) bytes = new Uint8Array(arr.buffer, arr.byteOffset, arr.byteLength);
+    else throw new Error("Unsupported type");
+    data.set(bytes, offset);
+    offset += bytes.byteLength;
   }
   return data;
 };
 
-class Site {
-  serverHeader;
-  clientHeader;
-  constructor(options) {
-    this.serverHeader = new ServerHeader(options);
-    this.clientHeader = new ClientHeader(ZEROAD_NETWORK_PUBLIC_KEY);
-  }
+function ZeroAdNetwork(options) {
+  const serverHeader = new ServerHeader(options);
+  const clientHeader = new ClientHeader(ZEROAD_NETWORK_PUBLIC_KEY);
+  return {
+    setLogLevel,
+    parseToken: clientHeader.parseToken.bind(clientHeader),
+    CLIENT_HEADER_NAME: clientHeader.NAME,
+    SERVER_HEADER_NAME: serverHeader.NAME,
+    SERVER_HEADER_VALUE: serverHeader.VALUE
+  };
 }
-let defaultSite;
-const init = (options) => defaultSite = new Site(options);
-const processRequest = (headerValue) => defaultSite.clientHeader.processRequest(headerValue);
-const getClientHeaderName = () => defaultSite.clientHeader.name;
-const getServerHeaderName = () => defaultSite.serverHeader.name;
-const getServerHeaderValue = () => defaultSite.serverHeader.value;
 
-export { CLIENT_HEADERS, ClientHeader, PROTOCOL_VERSION, SITE_FEATURES, ServerHeader, Site, ZEROAD_NETWORK_PUBLIC_KEY, getClientHeaderName, getServerHeaderName, getServerHeaderValue, init, processRequest };
+export { CLIENT_HEADERS, ClientHeader, PROTOCOL_VERSION, ServerHeader, ZEROAD_NETWORK_PUBLIC_KEY, ZeroAdNetwork };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@zeroad.network/token",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "license": "Apache-2.0",
-  "repository": "github:laurynas-karvelis/zeroad-token",
+  "repository": "github:laurynas-karvelis/zeroad-token-ts",
   "homepage": "https://zeroad.network",
   "private": false,
   "author": {
@@ -42,17 +42,21 @@
       "default": "./dist/browser.mjs"
     }
   },
+  "output": {
+    "exports": "named"
+  },
   "scripts": {
     "keys:generate": "bun run ./src/tools/cli.ts",
     "prettier": "prettier . --write",
-    "build": "pkgroll --target=node18"
+    "build": "pkgroll --target=node18",
+    "test": "bun test"
   },
   "dependencies": {},
   "devDependencies": {
     "@types/bun": "^1.3.3",
     "@types/node": "^24.10.0",
     "pkgroll": "^2.21.4",
-    "prettier": "^3.7.1",
+    "prettier": "^3.7.2",
     "typescript": "^5.9.3"
   }
 }