strated dependencies update

rstp-god · rstp-god · commit 845c7e50f7bb · 2022-11-29T14:29:56.000+03:00
diff --git a/karma.conf.js b/karma.conf.js
@@ -48,8 +48,8 @@ module.exports = function(config) {
                 new webpack.EnvironmentPlugin({
 					browser: JSON.stringify(true),
 					VERSION: JSON.stringify(packageJson.version),
-					API_KEY_PRIVATE_KEY: JSON.stringify(process.env.API_KEY_PRIVATE_KEY),
-					API_KEY_ID: JSON.stringify(process.env.API_KEY_ID),
+					API_KEY_PRIVATE_KEY: JSON.stringify(process.env.APP_KEY),
+					API_KEY_ID: JSON.stringify(process.env.APP_KEY_ID),
 					APP_ID: JSON.stringify(process.env.APP_ID),
 					API_URL: JSON.stringify(process.env.API_URL),
                 }),
diff --git a/package.json b/package.json
@@ -38,58 +38,61 @@
   ],
   "license": "BSD-3-Clause",
   "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/chai-as-promised": "^7.1.0",
-    "@types/mkdirp": "^1.0.0",
-    "@types/mocha": "^7.0.2",
-    "@types/node": "^13.13.2",
-    "@types/rimraf": "^3.0.0",
-    "@types/sinon": "^5.0.6",
-    "@types/sinon-chai": "^3.2.1",
+    "@types/chai": "^4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/jest": "^29.2.2",
+    "@types/mkdirp": "^1.0.2",
+    "@types/mocha": "^10.0.0",
+    "@types/node": "^18.11.9",
+    "@types/rimraf": "^3.0.2",
+    "@types/sinon": "^10.0.13",
+    "@types/sinon-chai": "^3.2.9",
     "buffer-es6": "^4.9.3",
-    "builtin-modules": "^3.0.0",
-    "chai": "^4.2.0",
+    "builtin-modules": "^3.3.0",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "dotenv": "^8.2.0",
-    "file-loader": "^6.0.0",
-    "karma": "^6.0.0",
+    "dotenv": "^16.0.3",
+    "file-loader": "^6.2.0",
+    "karma": "^6.4.1",
     "karma-chai-plugins": "^0.9.0",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma-chrome-launcher": "^3.1.1",
     "karma-mocha": "^2.0.0",
-    "karma-rollup-preprocessor": "^7.0.2",
-    "karma-webpack": "^4.0.2",
-    "mocha": "^7.1.1",
-    "rollup": "^2.7.2",
+    "karma-rollup-preprocessor": "^7.0.8",
+    "karma-webpack": "^5.0.0",
+    "mocha": "^10.1.0",
+    "rollup": "^3.2.5",
     "rollup-plugin-commonjs": "^10.0.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-terser": "^5.1.1",
-    "rollup-plugin-typescript2": "^0.27.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-typescript2": "^0.34.1",
     "rollup-plugin-wasm": "^3.0.0",
-    "sinon": "^9.0.2",
-    "sinon-chai": "^3.0.0",
-    "ts-loader": "^7.0.1",
-    "ts-node": "^8.1.0",
-    "typedoc": "^0.17.3",
-    "typescript": "^3.1.6",
+    "sinon": "^14.0.2",
+    "sinon-chai": "^3.7.0",
+    "ts-loader": "^9.4.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.20",
+    "typescript": "^4.8.4",
     "virgil-crypto": "^4.0.0"
   },
   "dependencies": {
-    "@types/base-64": "^0.1.3",
-    "@types/utf8": "^2.1.6",
+    "@types/base-64": "^1.0.0",
+    "@types/utf8": "^3.0.1",
     "@virgilsecurity/crypto-types": "^1.0.0",
-    "base-64": "^0.1.0",
-    "fetch-ponyfill": "^6.1.1",
-    "mkdirp": "^1.0.3",
+    "base-64": "^1.0.0",
+    "fetch-ponyfill": "^7.1.0",
+    "mkdirp": "^1.0.4",
     "rimraf": "^3.0.2",
+    "ts-mocha": "^10.0.0",
     "utf8": "^3.0.0",
-    "webpack": "^4.43.0"
+    "webpack": "^5.74.0"
   },
+  "type": "module",
   "scripts": {
     "clean": "rimraf .rpt2_cache dist",
     "build": "rollup -c",
     "prepare": "npm run clean && npm run build",
-    "test:node": "mocha --require ts-node/register --require dotenv/config --require scripts/register-assert \"src/**/*.test.ts\"",
+    "test:node": "ts-mocha -p tsconfig.spec.json \"src/**/*.test.ts\"",
     "test:browser": "karma start",
     "test": "npm run test:node && npm run test:browser",
     "preversion": "npm run test",
diff --git a/src/Storage/PrivateKeyStorage.ts b/src/Storage/PrivateKeyStorage.ts
@@ -44,7 +44,7 @@ export class PrivateKeyStorage {
 		const privateKeyData = this.privateKeyExporter.exportPrivateKey(privateKey);
 		try {
 			await this.keyEntryStorage.save({ name, value: privateKeyData.toString('base64'), meta });
-		} catch (error) {
+		} catch (error: any) {
 			if (error && error.name === 'KeyEntryAlreadyExistsError') {
 				throw new PrivateKeyExistsError(`Private key with the name ${name} already exists.`);
 			}
diff --git a/src/Storage/adapters/IndexedDbStorageAdapter.ts b/src/Storage/adapters/IndexedDbStorageAdapter.ts
@@ -467,7 +467,7 @@ function _getConnection(dbInfo: DbInfo, upgradeNeeded: boolean): Promise<IDBData
 				const db = openReq.result;
 				try {
 					db.createObjectStore(dbInfo.storeName);
-				} catch (ex) {
+				} catch (ex: any) {
 					if (ex.name === 'ConstraintError') {
 						console.warn(
 							'The database "' +
@@ -597,7 +597,7 @@ function createTransaction(
 	try {
 		const tx = dbInfo.db!.transaction(dbInfo.storeName!, mode);
 		callback(null, tx);
-	} catch (err) {
+	} catch (err: any) {
 		if (
 			retries > 0 &&
 			(!dbInfo.db ||
diff --git a/src/__tests__/declarations.d.ts b/src/__tests__/declarations.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="sinon" />
 
+import * as Chai from "chai";
 import AssertStatic = Chai.AssertStatic;
 import SinonSpy = sinon.SinonSpy;
 import SinonSpyCall = sinon.SinonSpyCall;
@@ -46,3 +47,4 @@ declare module NodeJS {
 		browser?: boolean;
 	}
 }
+
diff --git a/src/__tests__/integration/CardManager.test.ts b/src/__tests__/integration/CardManager.test.ts
@@ -10,8 +10,14 @@ import {
 } from '../..';
 import { VirgilCardVerificationError } from '../../Cards/errors';
 import { ICard } from '../../Cards/ICard';
-
+import * as chaiAsPromised from "chai-as-promised";
 import { compatData } from './data';
+import { use } from "chai";
+// @ts-ignore
+import {
+	assert,
+	sinon
+} from '../declarations';
 
 const WELL_KNOWN_IDENTITY = `js_sdk_well_known_identity${Date.now()}@virgil.com`;
 let WELL_KNOWN_CARD_ID:string;
@@ -21,20 +27,20 @@ const init = (identity: string = WELL_KNOWN_IDENTITY) => {
 	const accessTokenSigner = new VirgilAccessTokenSigner(crypto);
 	const cardCrypto = new VirgilCardCrypto(crypto);
 
-	const apiPrivateKey = crypto.importPrivateKey(process.env.API_KEY_PRIVATE_KEY!);
+	const apiPrivateKey = crypto.importPrivateKey(process.env.APP_KEY!);
 
 	const jwtGenerator = new JwtGenerator({
 		appId: process.env.APP_ID!,
 		apiKey: apiPrivateKey,
-		apiKeyId: process.env.API_KEY_ID!,
+		apiKeyId: process.env.APP_KEY_ID!,
 		accessTokenSigner,
 		millisecondsToLive: 20 * 60 * 1000
 	});
 
 	const expiredTokenGenerator = new JwtGenerator({
 		appId: process.env.APP_ID!,
 		apiKey: apiPrivateKey,
-		apiKeyId: process.env.API_KEY_ID!,
+		apiKeyId: process.env.APP_KEY_ID!,
 		accessTokenSigner,
 		millisecondsToLive: 1000
 	});
@@ -59,15 +65,13 @@ const init = (identity: string = WELL_KNOWN_IDENTITY) => {
 	};
 };
 
-describe('CardManager', function () {
+describe('CardManager', async function () {
 
-	this.timeout(10000);
+	//this.timeout(10000);
+	await initCrypto();
 
-	before(async () => {
-		await initCrypto();
-	});
-
-	before(() => {
+	before( () => {
+		use(chaiAsPromised)
 		const { cardManager, crypto, cardVerifier } = init();
 		const keypair = crypto.generateKeys();
 		cardVerifier.verifySelfSignature = false;
@@ -195,10 +199,10 @@ describe('CardManager', function () {
 			);
 		});
 
-		it ('verifies cards after publishing', () => {
+		it ('verifies cards after publishing', async() => {
 			const keypair = crypto.generateKeys();
 
-			return assert.isRejected(
+			return await assert.isRejected(
 				cardManager.publishCard({
 					privateKey: keypair.privateKey,
 					publicKey: keypair.publicKey,
@@ -208,7 +212,7 @@ describe('CardManager', function () {
 			);
 		});
 
-		it ('verifies cards after publishing as raw model', () => {
+		it ('verifies cards after publishing as raw model', async () => {
 			const keypair = crypto.generateKeys();
 			const rawCard = cardManager.generateRawCard({
 				privateKey: keypair.privateKey,
@@ -222,14 +226,14 @@ describe('CardManager', function () {
 			);
 		});
 
-		it ('verifies cards on get', () => {
+		it ('verifies cards on get', async () => {
 			return assert.isRejected(
 				cardManager.getCard(WELL_KNOWN_CARD_ID),
 				VirgilCardVerificationError
 			);
 		});
 
-		it ('verifies cards on search', () => {
+		it ('verifies cards on search', async () => {
 			return assert.isRejected(
 				cardManager.searchCards(WELL_KNOWN_IDENTITY),
 				VirgilCardVerificationError
@@ -476,19 +480,19 @@ describe('CardManager', function () {
 				.callsFake(getTokenFn as any);
 		});
 
-		it ('retries get card', () => {
+		it ('retries get card', async () => {
 			return assert.isFulfilled(
 				cardManager.getCard(WELL_KNOWN_CARD_ID)
 			);
 		});
 
-		it ('retries search cards', () => {
+		it ('retries search cards', async () => {
 			return assert.isFulfilled(
 				cardManager.searchCards(WELL_KNOWN_IDENTITY)
 			);
 		});
 
-		it ('retries publish card', () => {
+		it ('retries publish card', async () => {
 			const { privateKey, publicKey } = crypto.generateKeys();
 			return assert.isFulfilled(
 				cardManager.publishCard({
diff --git a/src/__tests__/unit/PrivateKeyStorage.test.ts b/src/__tests__/unit/PrivateKeyStorage.test.ts
@@ -48,10 +48,12 @@ describe ('PrivateKeyStorage', () => {
 	describe ('load', () => {
 		it ('imports private key data before returning', () => {
 			const thePrivateKey = {};
-			privateKeyExporterStub.importPrivateKey.returns(thePrivateKey);
+			privateKeyExporterStub.importPrivateKey.returns(thePrivateKey as IPrivateKey);
 			storageBackendStub.load.withArgs('test').resolves({
 				name: 'test',
-				value: Buffer.from('private_key'),
+				value: Buffer.from('private_key') as unknown as string,
+				creationDate: new Date(),
+				modificationDate: new Date(),
 				meta: { meta: 'data' }
 			});
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,15 +1,26 @@
 {
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es5",
-    "lib": ["es2015", "es2016", "es2017", "es2018", "dom"],
+  "compilerOptions":  {
+    "lib": ["es5", "es6", "dom", "dom.iterable"],
+    "baseUrl": ".",
+    "target": "es2020",
+    "outDir": "./dist",
+    "forceConsistentCasingInFileNames": true,
     "strict": true,
+    "noImplicitReturns": false,
+    "strictPropertyInitialization": false,
+    "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
     "declaration": true,
-    "esModuleInterop": true,
+    "declarationDir": "./dist/types",
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "importHelpers": true,
     "allowSyntheticDefaultImports": true,
-    "declarationDir": "dist/types",
-    "resolveJsonModule": true
+    "types": ["node", "jest", "mocha"],
+    "module": "es2015",
+    "noImplicitAny": true,
+    "resolveJsonModule": true,
   },
   "include": [
     "src"
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
@@ -0,0 +1,26 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitReturns": false,
+    "strictPropertyInitialization": false,
+    "noFallthroughCasesInSwitch": true,
+    "sourceMap": true,
+    "declaration": true,
+    "declarationDir": "./dist/types",
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "noImplicitAny": true,
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "esModuleInterop": true,
+    "target": "es2020",
+    "module": "commonjs",
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  },
+}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export class PrivateKeyStorage {`
`44`	`44`	`const privateKeyData = this.privateKeyExporter.exportPrivateKey(privateKey);`
`45`	`45`	`try {`
`46`	`46`	`await this.keyEntryStorage.save({ name, value: privateKeyData.toString('base64'), meta });`
`47`		`- } catch (error) {`
	`47`	`+ } catch (error: any) {`
`48`	`48`	`if (error && error.name === 'KeyEntryAlreadyExistsError') {`
`49`	`49`	throw new PrivateKeyExistsError(`Private key with the name ${name} already exists.`);
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`/// <reference types="sinon" />`
`2`	`2`
	`3`	`+import * as Chai from "chai";`
`3`	`4`	`import AssertStatic = Chai.AssertStatic;`
`4`	`5`	`import SinonSpy = sinon.SinonSpy;`
`5`	`6`	`import SinonSpyCall = sinon.SinonSpyCall;`
`@@ -46,3 +47,4 @@ declare module NodeJS {`
`46`	`47`	`browser?: boolean;`
`47`	`48`	`}`
`48`	`49`	`}`
	`50`	`+`