ecwt 0.1.1-beta.2 → 0.2.0-beta.2

package/README.md

@@ -69,32 +69,24 @@ const lruCache = new LRUCache({
 
 #### Validation library of your choice (optional)
 
-To reduce the size of the token, ECWT does not include object keys in the payload. By specifying the schema, you also can validate the payloads.
+By specifying the schema, you also validate the payloads. Schema is a function that takes a value and returns it back or throws.
 
 In our example, we use [valibot](https://valibot.dev) library.
 
 ```javascript
-import {
-	number,
-	string,
-	maxValue,
-	maxLength,
-	safeParse } from 'valibot';
-
-const schema = {
-    user_id: (value) => safeParse(
-        number([
-            maxValue(10),
-        ]),
-        value,
-    ).success,
-    nick: (value) => safeParse(
-        string([
-            maxLength(10),
-        ]),
-        value,
-    ).success,
-};
+import * as v from 'valibot';
+
+const schema = (value) => v.parse(
+	v.object({
+		user_id: v.number([
+			v.maxValue(10),
+		]),
+		nick: v.string([
+			v.maxLength(10),
+		]),
+	}),
+	value,
+);
 ```
 
 That schema will prevent creating tokens for users with ID greater than 10 and nicknames longer than 10 characters.
@@ -111,14 +103,15 @@ constructor({
     options: {
         namespace: string?,
         key: Buffer,
-        schema: {
-            [key: string]: (value: any) => boolean,
-        } = {},
+        schema: (value: any) => any,
+        senmlKeyMap: {
+			[key: string]: number,
+		}?,
     },
 })
 ```
 
-Create your `EcwtFactory` instance to create, and parse tokens.
+Create your `EcwtFactory` instance to create, validate and revoke tokens.
 
 ```javascript
 import { EcwtFactory } from 'ecwt';
@@ -135,10 +128,16 @@ const ecwtFactory = new EcwtFactory({
 			'base64',
 		),
 		schema,
+		senml_key_map: {
+			user_id: 1,
+			nick: 2,
+		},
 	},
 });
 ```
 
+To reduce token size, which is especially important to reduce amount of data sent over the network, you can use `options.senml_key_map` to map keys to numbers. This way, CBOR encoder will use numbers instead of strings in object keys. You **should never change** number assigned to a key or **reassign number** to another key to avoid breaking the schema. For more information, see [RFC 8428](https://datatracker.ietf.org/doc/html/rfc8428#section-6).
+
 #### Class method `create`
 
 ```typescript

package/dist/ecwt.cjs

@@ -33,6 +33,7 @@ __export(main_exports, {
   EcwtExpiredError: () => EcwtExpiredError,
   EcwtFactory: () => EcwtFactory,
   EcwtInvalidError: () => EcwtInvalidError,
+  EcwtParseError: () => EcwtParseError,
   EcwtRevokedError: () => EcwtRevokedError
 });
 module.exports = __toCommonJS(main_exports);
@@ -145,6 +146,10 @@ var Ecwt = class {
     }
     return this.#ttl_initial - toSeconds(Date.now() - this.snowflake.timestamp);
   }
+  /**
+   * Revokes token.
+   * @returns {Promise<void>} -
+   */
   /* async */
   revoke() {
     return this.#ecwtFactory._revoke({
@@ -165,6 +170,11 @@ var InvalidPackageInstanceError = class extends TypeError {
     super(`Value ${property} must be an instance of ${class_name} from package "${package_name}". That error is probably caused by two separate installations of "${package_name}". Please, make sure that "${package_name}" in your project is matches "peerDependencies" of "ecwt" package.`);
   }
 };
+var EcwtParseError = class extends Error {
+  constructor() {
+    super("Cannot parse data to Ecwt token.");
+  }
+};
 var EcwtInvalidError = class extends Error {
   constructor(ecwt) {
     super("Ecwt token is invalid.");
@@ -204,8 +214,8 @@ var EcwtFactory = class {
   #snowflakeFactory;
   #redis_keys = {};
   #encryption_key;
-  #schema;
-  #schema_keys_sorted;
+  #validator;
+  #cborEncoder;
   /**
    *
    * @param {object} param0 -
@@ -215,7 +225,8 @@ var EcwtFactory = class {
    * @param {object} param0.options -
    * @param {string} [param0.options.namespace] Namespace for Redis keys.
    * @param {Buffer} param0.options.key Encryption key, 64 bytes
-   * @param {{ [key: string]: (value: any) => boolean }} param0.options.schema Schema for token data. Each property is a validator function that returns true if value is valid.
+   * @param {(value: any) => any} [param0.options.validator] Validator for token data. Should return validated value or throw an error.
+   * @param {{ [key: string]: number }} [param0.options.senml_key_map] Payload object keys mapped for their SenML keys.
    */
   constructor({
     redisClient: redisClient2 = null,
@@ -224,7 +235,8 @@ var EcwtFactory = class {
     options: {
       namespace = null,
       key,
-      schema = {}
+      validator,
+      senml_key_map
     }
   }) {
     if (redisClient2 !== null && (redisClient2.constructor.name !== redis_client_constructor_name || getAllKeysList(redisClient2) !== redis_client_keys)) {
@@ -253,8 +265,12 @@ var EcwtFactory = class {
     this.#snowflakeFactory = snowflakeFactory;
     this.#redis_keys.revoked = `${REDIS_PREFIX}${namespace}:revoked`;
     this.#encryption_key = key;
-    this.#schema = schema;
-    this.#schema_keys_sorted = Object.keys(schema).sort();
+    this.#validator = validator;
+    if (senml_key_map) {
+      this.#cborEncoder = new import_cbor_x.Encoder({
+        keyMap: senml_key_map
+      });
+    }
   }
   /**
    * Creates new token.
@@ -267,24 +283,19 @@ var EcwtFactory = class {
   async create(data, {
     ttl
   } = {}) {
-    const payload = [];
-    for (const key of this.#schema_keys_sorted) {
-      const value = data[key];
-      const validator = this.#schema[key];
-      if (typeof validator === "function" && validator(value) !== true) {
-        throw new TypeError(`Value "${value}" of property "${key}" is invalid.`);
-      }
-      payload.push(value);
+    if (typeof this.#validator === "function") {
+      data = this.#validator(data);
     }
     if (typeof ttl !== "number" && Number.isNaN(ttl) !== true && ttl !== null) {
       throw new TypeError("TTL must be a number or null.");
     }
     const snowflake = await this.#snowflakeFactory.createSafe();
-    const token_raw = (0, import_cbor_x.encode)([
+    const payload = [
       snowflake.toBuffer(),
       ttl,
-      payload
-    ]);
+      data
+    ];
+    const token_raw = this.#cborEncoder ? this.#cborEncoder.encode(payload) : (0, import_cbor_x.encode)(payload);
     const token_encrypted = await import_evilcrypt.v2.encrypt(
       token_raw,
       this.#encryption_key
@@ -335,20 +346,31 @@ var EcwtFactory = class {
       const token_encrypted = Buffer.from(
         base62.decode(token)
       );
-      const token_raw = await (0, import_evilcrypt.decrypt)(
-        token_encrypted,
-        this.#encryption_key
-      );
+      let token_raw;
+      try {
+        token_raw = await (0, import_evilcrypt.decrypt)(
+          token_encrypted,
+          this.#encryption_key
+        );
+      } catch {
+        throw new EcwtParseError();
+      }
+      const payload = this.#cborEncoder ? this.#cborEncoder.decode(token_raw) : (0, import_cbor_x.decode)(token_raw);
       const [
-        snowflake_buffer,
-        _ttl_initial,
-        payload
-      ] = (0, import_cbor_x.decode)(token_raw);
+        snowflake_buffer
+      ] = payload;
+      [
+        ,
+        ttl_initial,
+        data
+      ] = payload;
       snowflake = this.#snowflakeFactory.parse(snowflake_buffer);
-      ttl_initial = _ttl_initial;
-      data = {};
-      for (const [index, key] of this.#schema_keys_sorted.entries()) {
-        data[key] = payload[index];
+      if (typeof this.#validator === "function") {
+        try {
+          data = this.#validator(data);
+        } catch {
+          throw new EcwtParseError();
+        }
       }
       this.#setCache(
         token,
@@ -432,5 +454,6 @@ var EcwtFactory = class {
   EcwtExpiredError,
   EcwtFactory,
   EcwtInvalidError,
+  EcwtParseError,
   EcwtRevokedError
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ecwt",
-	"version": "0.1.1-beta.2",
+	"version": "0.2.0-beta.2",
 	"description": "Encrypted CBOR-encoded Web Token",
 	"main": "src/main.js",
 	"type": "module",
@@ -20,7 +20,7 @@
 	},
 	"peerDependencies": {
 		"@kirick/snowflake": "^0.2.1-beta.1",
-		"lru-cache": "^7 || ^8 || ^9 || ^10",
+		"lru-cache": "^9 || ^10",
 		"redis": "^4"
 	},
 	"devDependencies": {
@@ -28,20 +28,21 @@
 		"eslint": "8.41.0",
 		"eslint-config-xo": "0.43.1",
 		"eslint-plugin-import": "2.27.5",
-		"eslint-plugin-jsdoc": "^46.9.1",
+		"eslint-plugin-jsdoc": "46.9.1",
 		"eslint-plugin-node": "11.1.0",
 		"eslint-plugin-promise": "6.1.1",
 		"eslint-plugin-unicorn": "47.0.0",
-		"jest": "^29.7.0",
-		"valibot": "^0.24.1"
+		"valibot": "^0.24.1",
+		"vitest": "1.3.1"
 	},
 	"scripts": {
-		"test": "bun run redis-up && npm run test-node && bun test",
-		"test-node": "NODE_OPTIONS=--experimental-vm-modules jest --forceExit",
+		"test": "bun run redis-up && bun test && npm run test-node",
+		"test-node": "vitest run --no-file-parallelism",
 		"coverage": "bun run redis-up && bun test --coverage",
 		"build": "bun run build-cjs",
 		"build-cjs": "bunx esbuild --bundle --platform=node --format=cjs --packages=external --outfile=dist/ecwt.cjs src/main.js",
-		"npm-publish": "bun run build && bun run eslint . && bun run test && npm publish --tag beta; bun run redis-down",
+		"npm-publish": "bun run build && bun run eslint . && bun run test && npm publish; bun run redis-down",
+		"npm-publish-beta": "bun run build && bun run eslint . && bun run test && npm publish --tag beta; bun run redis-down",
 		"redis-up": "docker ps | grep test-redis-ecwt-test >/dev/null || docker run --rm -d -p 16274:6379 --name test-redis-ecwt-test redis:7-alpine",
 		"redis-down": "docker stop test-redis-ecwt-test"
 	},

package/src/factory.js

@@ -1,6 +1,7 @@
 
 import { SnowflakeFactory }       from '@kirick/snowflake';
 import {
+	Encoder as CborEncoder,
 	encode as cborEncode,
 	decode as cborDecode }        from 'cbor-x';
 import {
@@ -13,7 +14,8 @@ import { base62 }                 from './utils/base62.js';
 import {
 	InvalidPackageInstanceError,
 	EcwtExpiredError,
-	EcwtRevokedError }            from './utils/errors.js';
+	EcwtRevokedError,
+    EcwtParseError }              from './utils/errors.js';
 
 const REDIS_PREFIX = '@ecwt:';
 
@@ -39,8 +41,8 @@ export class EcwtFactory {
 	#redis_keys = {};
 	#encryption_key;
 
-	#schema;
-	#schema_keys_sorted;
+	#validator;
+	#cborEncoder;
 
 	/**
 	 *
@@ -51,7 +53,8 @@ export class EcwtFactory {
 	 * @param {object} param0.options -
 	 * @param {string} [param0.options.namespace] Namespace for Redis keys.
 	 * @param {Buffer} param0.options.key Encryption key, 64 bytes
-	 * @param {{ [key: string]: (value: any) => boolean }} param0.options.schema Schema for token data. Each property is a validator function that returns true if value is valid.
+	 * @param {(value: any) => any} [param0.options.validator] Validator for token data. Should return validated value or throw an error.
+	 * @param {{ [key: string]: number }} [param0.options.senml_key_map] Payload object keys mapped for their SenML keys.
 	 */
 	constructor({
 		redisClient = null,
@@ -60,7 +63,8 @@ export class EcwtFactory {
 		options: {
 			namespace = null,
 			key,
-			schema = {},
+			validator,
+			senml_key_map,
 		},
 	}) {
 		if (
@@ -103,8 +107,13 @@ export class EcwtFactory {
 
 		this.#encryption_key = key;
 
-		this.#schema = schema;
-		this.#schema_keys_sorted = Object.keys(schema).sort();
+		this.#validator = validator;
+
+		if (senml_key_map) {
+			this.#cborEncoder = new CborEncoder({
+				keyMap: senml_key_map,
+			});
+		}
 	}
 
 	/**
@@ -121,19 +130,8 @@ export class EcwtFactory {
 			ttl,
 		} = {},
 	) {
-		const payload = [];
-		for (const key of this.#schema_keys_sorted) {
-			const value = data[key];
-			const validator = this.#schema[key];
-
-			if (
-				typeof validator === 'function'
-				&& validator(value) !== true
-			) {
-				throw new TypeError(`Value "${value}" of property "${key}" is invalid.`);
-			}
-
-			payload.push(value);
+		if (typeof this.#validator === 'function') {
+			data = this.#validator(data);
 		}
 
 		if (
@@ -146,11 +144,14 @@ export class EcwtFactory {
 
 		const snowflake = await this.#snowflakeFactory.createSafe();
 
-		const token_raw = cborEncode([
+		const payload = [
 			snowflake.toBuffer(),
 			ttl,
-			payload,
-		]);
+			data,
+		];
+		const token_raw = this.#cborEncoder
+			? this.#cborEncoder.encode(payload)
+			: cborEncode(payload);
 
 		const token_encrypted = await evilcryptV2.encrypt(
 			token_raw,
@@ -205,29 +206,45 @@ export class EcwtFactory {
 		let data;
 
 		const cached_entry = this.#lruCache?.info(token);
-		// token is cached
+		// token is not cached
 		if (cached_entry === undefined) {
 			const token_encrypted = Buffer.from(
 				base62.decode(token),
 			);
 
-			const token_raw = await evilcryptDecrypt(
-				token_encrypted,
-				this.#encryption_key,
-			);
+			let token_raw;
+			try {
+				token_raw = await evilcryptDecrypt(
+					token_encrypted,
+					this.#encryption_key,
+				);
+			}
+			catch {
+				throw new EcwtParseError();
+			}
+
+			const payload = this.#cborEncoder
+				? this.#cborEncoder.decode(token_raw)
+				: cborDecode(token_raw);
 
 			const [
 				snowflake_buffer,
-				_ttl_initial,
-				payload,
-			] = cborDecode(token_raw);
+			] = payload;
+			[
+				,
+				ttl_initial,
+				data,
+			] = payload;
 
 			snowflake = this.#snowflakeFactory.parse(snowflake_buffer);
-			ttl_initial = _ttl_initial;
 
-			data = {};
-			for (const [ index, key ] of this.#schema_keys_sorted.entries()) {
-				data[key] = payload[index];
+			if (typeof this.#validator === 'function') {
+				try {
+					data = this.#validator(data);
+				}
+				catch {
+					throw new EcwtParseError();
+				}
 			}
 
 			this.#setCache(

package/src/main.js

@@ -2,6 +2,7 @@
 export { EcwtFactory } from './factory.js';
 export { Ecwt } from './token.js';
 export {
+	EcwtParseError,
 	EcwtInvalidError,
 	EcwtExpiredError,
 	EcwtRevokedError,

package/src/token.js

@@ -120,6 +120,10 @@ export class Ecwt {
 		return this.#ttl_initial - toSeconds(Date.now() - this.snowflake.timestamp);
 	}
 
+	/**
+	 * Revokes token.
+	 * @returns {Promise<void>} -
+	 */
 	/* async */ revoke() {
 		return this.#ecwtFactory._revoke({
 			token_id: this.id,

package/src/utils/errors.js

@@ -5,6 +5,12 @@ export class InvalidPackageInstanceError extends TypeError {
 	}
 }
 
+export class EcwtParseError extends Error {
+	constructor() {
+		super('Cannot parse data to Ecwt token.');
+	}
+}
+
 export class EcwtInvalidError extends Error {
 	constructor(ecwt) {
 		super('Ecwt token is invalid.');