Merge pull request #10 from ESTOS/feature/BUILDSYS-367-send-http-rpc-…

…without-rose-envelop

3.1.12 Bugfix release

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [18.x, 19.x, 20.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -36,6 +36,9 @@ jobs:
       - name: Run linter
         run: npm run lint
 
+      - name: Build
+        run: npm run
+
       - name: Run test with coverage
         run: npm run coverage
 

package.json

@@ -1,9 +1,17 @@
 {
+  "name": "@estos/asn1ts",
+  "version": "3.1.12",
+  "license": "BSD-3-Clause",
   "author": {
-    "email": "jan@estos.de",
-    "name": "Jan Fellner"
+    "name": "estos GmbH",
+    "email": "info@estos.de",
+    "url": "https://www.estos.de"
   },
   "contributors": [
+    {
+      "email": "jan@estos.de",
+      "name": "Jan Fellner"
+    },
     {
       "email": "yury@strozhevsky.com",
       "name": "Yury Strozhevsky"
@@ -14,30 +22,31 @@
     }
   ],
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=18.0.0"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
+    "@types/node": "^20.8.6",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "asn1-test-suite": "^1.0.2",
     "eslint": "^8.31.0",
-    "eslint-plugin-deprecation": "^1.3.3",
+    "eslint-plugin-deprecation": "^2.0.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "rollup": "^3.9.1",
-    "rollup-plugin-dts": "^5.1.1",
+    "rollup": "^4.1.4",
+    "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-typescript2": "^0.34.1",
+    "rollup-plugin-typescript2": "^0.36.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^5.2.2"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/ESTOS/ASN1.ts.git"
   },
   "dependencies": {
+    "jest": "^29.7.0",
     "pvtsutils": "^1.3.2",
     "pvutils": "^1.1.3",
     "tslib": "^2.4.1"
@@ -65,7 +74,6 @@
   "main": "build/index.js",
   "module": "build/index.es.js",
   "types": "build/index.d.ts",
-  "name": "@estos/asn1ts",
   "files": [
     "build",
     "LICENSE",
@@ -78,7 +86,5 @@
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint --fix . --ext .ts",
     "coverage": "nyc npm test"
-  },
-  "version": "3.1.11",
-  "license": "BSD-3-Clause"
+  }
 }

rollup.config.mjs

@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import typescript from "rollup-plugin-typescript2";
 import dts from "rollup-plugin-dts";
-import pkg from "./package.json" assert { type: 'json' };
+import pkg from "./package.json" assert { type: "json" };
 
 const __dirname = path.resolve();
 const LICENSE = fs.readFileSync("LICENSE", { encoding: "utf-8" });

src/internals/LocalBitStringValueBlock.ts

@@ -150,19 +150,4 @@ export class LocalBitStringValueBlock extends HexBlock(LocalConstructedValueBloc
       isConstructed: this.isConstructed,
     } as LocalBitStringValueBlockJson;
   }
-}
-
-export interface LocalBitStringValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}
+}

src/internals/LocalBooleanValueBlock.ts

@@ -78,18 +78,3 @@ export class LocalBooleanValueBlock extends HexBlock(ValueBlock) implements ILoc
     };
   }
 }
-
-export interface LocalBooleanValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalIdentificationBlock.ts

@@ -316,18 +316,3 @@ export class LocalIdentificationBlock extends HexBlock(LocalBaseBlock) implement
     return this.tagClass === other.tagClass && this.tagNumber === other.tagNumber;
   }
 }
-
-export interface LocalIdentificationBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  /** @ts-ignore */
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  /** @ts-ignore */
-  valueHex: ArrayBuffer;
-}

src/internals/LocalIntegerValueBlock.ts

@@ -257,18 +257,3 @@ export class LocalIntegerValueBlock extends HexBlock(ValueBlock) {
   }
 
 }
-
-export interface LocalIntegerValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalOctetStringValueBlock.ts

@@ -86,18 +86,3 @@ export class LocalOctetStringValueBlock extends HexBlock(LocalConstructedValueBl
   }
 
 }
-
-export interface LocalOctetStringValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalPrimitiveValueBlock.ts

@@ -19,18 +19,3 @@ export class LocalPrimitiveValueBlock extends HexBlock(ValueBlock) {
   }
 
 }
-
-export interface LocalPrimitiveValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalRealValueBlock.ts

@@ -460,18 +460,3 @@ export class LocalRealValueBlock extends HexBlock(ValueBlock) {
   }
 
 }
-
-export interface LocalRealValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalSidValueBlock.ts

@@ -180,18 +180,3 @@ export class LocalSidValueBlock extends HexBlock(ValueBlock) implements ILocalSi
   }
 
 }
-
-export interface LocalSidValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/internals/LocalStringValueBlock.ts

@@ -35,18 +35,3 @@ export abstract class LocalStringValueBlock extends HexBlock(ValueBlock) impleme
   }
 
 }
-
-export interface LocalStringValueBlock {
-  /**
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueBeforeDecode: ArrayBuffer;
-  /**
-   * Binary data in ArrayBuffer representation
-   *
-   * @deprecated since version 3.0.0
-   */
-  // @ts-ignore
-  valueHex: ArrayBuffer;
-}

src/schema.ts

@@ -93,9 +93,9 @@ export enum ESchemaError {
   MISSING_CONSTRUCTED_FLAG_IN_SCHEMA = 7,
   /** Mismatching constructed flag between asn1 and schema */
   MISMATCHING_CONSTRUCTED_FLAG = 8,
-  /** The schema attribute has no constructed flag */
+  /** Missing is hex only flag in schems */
   MISSING_ISHEXONLY_FLAG_IN_SCHEMA = 9,
-  /** Mismatching constructed flag between asn1 and schema */
+  /** Mismatching is hex only flag between asn1 and schema */
   MISMATCHING_ISHEXONLY_FLAG = 10,
   /** The schema attribute has hexview flag */
   MISSING_HEXVIEW_IN_SCHEMA = 11,
@@ -110,7 +110,10 @@ export enum ESchemaError {
   /** Failed to match asn1 data with choice from the schema */
   NO_MATCHING_DATA_FOR_CHOICE = 17,
   /** The ASN1 structure is larger than the schema */
-  ASN1_IS_LARGER_THAN_SCHEMA = 18
+  ASN1_IS_LARGER_THAN_SCHEMA = 18,
+  /** Data and schema are not pointing to the same context specific entry */
+  MISMATCHING_CONTEXT_SPECIFIC_ID = 19
+
   /** If you add new Values !!! Add them to the getTextForError as well !!! */
 }
 
@@ -136,9 +139,9 @@ function getTextForError(error: ESchemaError): string {
     case ESchemaError.MISMATCHING_CONSTRUCTED_FLAG:
       return "Mismatching constructed flag between asn1 and schema";
     case ESchemaError.MISSING_ISHEXONLY_FLAG_IN_SCHEMA:
-      return "The schema attribute has no constructed flag";
+      return "Missing is hex only flag in schems";
     case ESchemaError.MISMATCHING_ISHEXONLY_FLAG:
-      return "Mismatching constructed flag between asn1 and schema";
+      return "Mismatching is hex only flag between asn1 and schema";
     case ESchemaError.MISSING_HEXVIEW_IN_SCHEMA:
       return "The schema attribute has hexview flag";
     case ESchemaError.MISMATCHING_HEX_VIEW_LENGTH:
@@ -153,6 +156,8 @@ function getTextForError(error: ESchemaError): string {
       return "Failed to match asn1 data with choice from the schema";
     case ESchemaError.ASN1_IS_LARGER_THAN_SCHEMA:
       return "The ASN1 structure is larger than the schema";
+    case ESchemaError.MISMATCHING_CONTEXT_SPECIFIC_ID:
+      return "Mismatching context specific id between schema and data";
     default:
       return `Unknown error: ${error}`;
   }
@@ -233,10 +238,12 @@ function compareSchemaInternal(root: AsnType, inputSchema: AsnSchemaType, option
       const schema = inputSchema.value[j];
       if ((bContextSpecific && inputData.idBlock.tagNumber === schema.idBlock.optionalID) || !bContextSpecific) {
         const savedTagClass = inputData.idBlock.tagClass;
-        const savedTagNumebr = inputData.idBlock.tagNumber;
+        const savedTagNumber = inputData.idBlock.tagNumber;
+        const savedOptionalID = inputData.idBlock.optionalID;
         if (bContextSpecific) {
             inputData.idBlock.tagClass = schema.idBlock.tagClass;
             inputData.idBlock.tagNumber = schema.idBlock.tagNumber;
+            inputData.idBlock.optionalID = schema.idBlock.optionalID;
         }
         const newContext = context.recurse(schema);
         const errors = compareSchemaInternal(root, schema, options, newContext, inputData);
@@ -247,7 +254,8 @@ function compareSchemaInternal(root: AsnType, inputSchema: AsnSchemaType, option
           return errors;
         } else if (bContextSpecific) {
             inputData.idBlock.tagClass = savedTagClass;
-            inputData.idBlock.tagNumber = savedTagNumebr;
+            inputData.idBlock.tagNumber = savedTagNumber;
+            inputData.idBlock.optionalID = savedOptionalID;
         }
       }
     }
@@ -414,6 +422,11 @@ function compareSchemaInternal(root: AsnType, inputSchema: AsnSchemaType, option
       errors.push(new SchemaError(ESchemaError.MISMATCHING_TAG_NUMBER, context));
       return errors;
     }
+  } else if(inputSchema.idBlock.optionalID !== inputData.idBlock.optionalID) {
+    // If the tag and the class are matching we need to ensure that the schema is matching the optionalID flags from the data
+    // IF that ist the case the data should have been encoded context specific to point to that field
+    errors.push(new SchemaError(ESchemaError.MISMATCHING_CONTEXT_SPECIFIC_ID, context));
+    return errors;
   }
 
   //#endregion
@@ -496,6 +509,9 @@ function compareSchemaInternal(root: AsnType, inputSchema: AsnSchemaType, option
       errors.push(new SchemaError(ESchemaError.MISMATCHING_OBJECT_LENGTH, context));
       return errors;
     }
+
+    // To match the input data with the schema we first need to match the mandatory attributes and then the optionals...
+
     /** Helper variable to improve searching for context specific optional attributes */
     /** The variable stores the last value where we found the last optional param */
     let nextOptional = 0;