@raytio/decrypt-helper 5.1.1 → 5.1.3

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 5.1.3 (2022-11-11)
+
+- !196 fix more issues caused by corrupted images
+- !192, !194 automated dependency updates
+
+## 5.1.2 (2022-11-10)
+
+- !195 retry API requests that fail with a 504 error
+- !195 fix crash from corrupted binary files
+
 ## 5.1.1 (2022-08-15)
 
 - !189 load verifier details faster

package/dist/api/authedFetch.d.ts

@@ -1 +1 @@
-export declare function authedFetch<T>(apiToken: string, url: string, options?: RequestInit): Promise<T>;
+export declare function authedFetch<T>(apiToken: string, url: string, options?: RequestInit, retrying?: boolean): Promise<T>;

package/dist/api/authedFetch.js

@@ -10,12 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authedFetch = void 0;
-function authedFetch(apiToken, url, options) {
+function authedFetch(apiToken, url, options, retrying = false) {
     return __awaiter(this, void 0, void 0, function* () {
-        const apiResp = yield fetch(url, Object.assign(Object.assign({}, options), { headers: { Authorization: `Bearer ${apiToken}` } })).then((r) => r.json());
+        console.log(`[API] ${retrying ? "Retry" : "Start"} ${url}`);
+        const startTime = +new Date();
+        const req = yield fetch(url, Object.assign(Object.assign({}, options), { headers: { Authorization: `Bearer ${apiToken}` } }));
+        const apiResp = yield req.json();
         if (apiResp.message) {
+            if (!retrying && req.status === 504) {
+                console.log(`[API] Error ${req.status} (will retry) ${url}`);
+                return authedFetch(apiToken, url, options, true);
+            }
+            console.log(`[API] Error ${req.status} (no retry) ${url}`);
             throw new Error(`Failed due to API Error from ${url}: "${apiResp.message}"`);
         }
+        const totalTime = ((+new Date() - startTime) / 1000).toFixed(1);
+        console.log(`[API] Finish${retrying ? " after retry" : ""} (${totalTime}s) ${url}`);
         return apiResp;
     });
 }

package/dist/api/getFiles.d.ts

@@ -1,4 +1,4 @@
-import type { Instance, ProfileObject } from "@raytio/types";
+import type { Instance, NId, ProfileObject } from "@raytio/types";
 import { ApplicationEncryptorLike } from "../types";
 import { EnvConfig } from "./fetchEnvConfig";
-export declare function getFiles(profileObjects: ProfileObject[], instance: Instance, apiToken: string, envConfig: EnvConfig, applicationDecryptor: ApplicationEncryptorLike): Promise<Record<string, [dataUrl: string, fileExtension: string]>>;
+export declare function getFiles(profileObjects: ProfileObject[], instance: Instance, apiToken: string, envConfig: EnvConfig, applicationDecryptor: ApplicationEncryptorLike): Promise<Record<NId, [dataUrl: string, fileExtension: string]>>;

package/dist/api/getFiles.js

@@ -19,7 +19,7 @@ const mime_types_1 = require("mime-types");
 const file_1 = require("../helpers/file");
 const authedFetch_1 = require("./authedFetch");
 const TEMP_OBJ_PREFIX = "urn:temp_object:";
-const getFileExtn = (b64) => (0, mime_types_1.extension)(b64.split(":")[1].split(";base64,")[0]) || "txt";
+const getFileExtn = (b64) => { var _a; return (0, mime_types_1.extension)(((_a = b64.split(":")[1]) === null || _a === void 0 ? void 0 : _a.split(";base64,")[0]) || "text/plain") || "txt"; };
 const decryptFile = (encryptedData, encryptedObj, applicationDecryptor, wdek) => __awaiter(void 0, void 0, void 0, function* () {
     const clonedEncryptedObj = JSON.parse(JSON.stringify(encryptedObj));
     clonedEncryptedObj.encrypted_data.data = encryptedData;
@@ -29,7 +29,7 @@ const decryptFile = (encryptedData, encryptedObj, applicationDecryptor, wdek) =>
 const cleanApiResponse = (responseBody) => {
     try {
         const realB64 = atob(responseBody);
-        if (realB64.substr(0, 5) === "data:") {
+        if (realB64.slice(0, 5) === "data:") {
             return realB64;
         }
     }
@@ -65,6 +65,7 @@ function getFiles(profileObjects, instance, apiToken, envConfig, applicationDecr
                 const dataUrl = `data:${type};base64,${b64}`;
                 return [fileNId, [dataUrl, getFileExtn(dataUrl)]];
             }
+            // TODO: should realB64 be renamed to "realDataUrl"?
             const realB64 = yield (0, authedFetch_1.authedFetch)(apiToken, `${envConfig.api_url}/share/v2/access_application/instance/${instance.i_id}/profile_object/${fileNId}/content`).then(cleanApiResponse);
             if ((0, core_1.isEncrypted)(urnOrEncrypted)) {
                 const wdek = (_b = (_a = instance.keys[PONId]) === null || _a === void 0 ? void 0 : _a[fieldName]) === null || _b === void 0 ? void 0 : _b.data;
@@ -75,7 +76,7 @@ function getFiles(profileObjects, instance, apiToken, envConfig, applicationDecr
             }
             return [fileNId, [realB64, getFileExtn(realB64)]];
         })));
-        return Object.fromEntries(filesBase64.filter(([, v]) => !!v));
+        return Object.fromEntries(filesBase64.filter((file) => { var _a; return !!file[1] && ((_a = file[1][0]) === null || _a === void 0 ? void 0 : _a.includes(",")); }));
     });
 }
 exports.getFiles = getFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raytio/decrypt-helper",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "author": "Raytio",
   "description": "A helper to decrypt data shared by Raytio users",
   "main": "dist",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@aws-amplify/auth": "3.4.25",
-    "@peculiar/webcrypto": "^1.4.0",
+    "@peculiar/webcrypto": "^1.4.1",
     "@raytio/core": "^10.1.0",
     "@raytio/maxcryptor": "^3.1.0",
     "@raytio/types": "^6.0.2",
@@ -31,36 +31,37 @@
     "localstorage-polyfill": "^1.0.1",
     "mime-types": "^2.1.35",
     "node-fetch": "^2.6.7",
-    "pdfmake": "^0.2.5",
+    "pdfmake": "^0.2.6",
     "ramda": "^0.28.0"
   },
   "devDependencies": {
     "@raytio/react-intl-manager": "^6.3.0",
-    "@types/jest": "^28.1.6",
+    "@types/jest": "^29.2.2",
     "@types/jest-image-snapshot": "^5.1.0",
     "@types/jsx-pdf": "^2.2.2",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^16.11.48",
+    "@types/node": "^18.11.9",
     "@types/node-fetch": "^2.5.12",
-    "@types/pdfmake": "^0.2.1",
-    "@types/ramda": "^0.28.15",
+    "@types/pdfmake": "^0.2.2",
+    "@types/ramda": "^0.28.19",
     "babel-preset-react-app": "^10.0.1",
-    "dotenv": "^16.0.1",
-    "eslint": "^8.22.0",
-    "eslint-config-kyle": "^8.47.0",
-    "jest": "^28.1.3",
-    "jest-image-snapshot": "^5.1.0",
-    "jest-junit": "^14.0.0",
-    "pdf-to-img": "^1.2.0",
-    "ts-jest": "^28.0.7",
+    "dotenv": "^16.0.3",
+    "eslint": "^8.27.0",
+    "eslint-config-kyle": "^9.12.1",
+    "jest": "^29.3.1",
+    "jest-image-snapshot": "^6.0.0",
+    "jest-junit": "^14.0.1",
+    "pdf-to-img": "^2.0.0",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.4"
   },
   "eslintConfig": {
     "extends": "kyle",
     "rules": {
       "react/react-in-jsx-scope": 0,
       "react/style-prop-object": 0,
+      "react/no-unknown-property": 0,
       "@typescript-eslint/no-non-null-assertion": 0,
       "@typescript-eslint/no-unused-vars": [
         2,