@atlaspack/query 2.14.9 → 2.14.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaspack/query
 
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies [[`51aba5f`](https://github.com/atlassian-labs/atlaspack/commit/51aba5fc0e49235ee06bbc3c376f48c3e7da5c4b), [`1e32d4e`](https://github.com/atlassian-labs/atlaspack/commit/1e32d4eae6b3af3968e8a0ef97d35b4347fd4196), [`0b2f6f5`](https://github.com/atlassian-labs/atlaspack/commit/0b2f6f55794d3ff6e2f5a41f963e7e5dd8ad9f8d), [`6dd4ccb`](https://github.com/atlassian-labs/atlaspack/commit/6dd4ccb753541de32322d881f973d571dd57e4ca)]:
+  - @atlaspack/core@2.18.0
+  - @atlaspack/cache@3.2.5
+
 ## 2.14.9
 
 ### Patch Changes

package/lib/index.js

@@ -4,20 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadGraphs = loadGraphs;
-function _fs() {
-  const data = _interopRequireDefault(require("fs"));
-  _fs = function () {
-    return data;
-  };
-  return data;
-}
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _v() {
   const data = _interopRequireDefault(require("v8"));
   _v = function () {
@@ -55,51 +41,47 @@ const {
 } = require('./deep-imports.js');
 async function loadGraphs(cacheDir) {
   let cacheInfo = new Map();
-  let {
+  const cache = new LMDBLiteCache(cacheDir);
+  let requestGraphBlob;
+  let requestGraphKey;
+  let bundleGraphBlob;
+  let assetGraphBlob;
+  for (let key of cache.keys()) {
+    if (key.startsWith('Asset/')) {
+      continue;
+    } else if (key.startsWith('PackagerRunner/')) {
+      continue;
+    }
+    if (key.startsWith('RequestTracker/') && key.endsWith('/RequestGraph')) {
+      requestGraphBlob = key;
+      requestGraphKey = key.split('/').slice(0, -1).join('/');
+    }
+    if (key.startsWith('BundleGraph/')) {
+      bundleGraphBlob = key;
+    }
+    if (key.startsWith('AssetGraph/')) {
+      assetGraphBlob = key;
+    }
+  }
+  console.log({
     requestGraphBlob,
     bundleGraphBlob,
     assetGraphBlob
-  } = function getMostRecentCacheBlobs() {
-    let files = _fs().default.readdirSync(cacheDir);
-    let result = {};
-    let blobsToFind = [{
-      name: 'requestGraphBlob',
-      check: basename => basename.startsWith('requestGraph-') && !basename.startsWith('requestGraph-nodes')
-    }, {
-      name: 'bundleGraphBlob',
-      check: basename => basename.endsWith('BundleGraph-0')
-    }, {
-      name: 'assetGraphBlob',
-      check: basename => basename.endsWith('AssetGraph-0')
-    }];
-    for (let file of files) {
-      let basename = _path().default.basename(file);
-      let match = blobsToFind.find(({
-        check
-      }) => check(basename));
-      if (match) {
-        let stat = _fs().default.statSync(_path().default.join(cacheDir, file));
-        if (!match.mtime || stat.mtime > match.mtime) {
-          match.mtime = stat.mtime;
-          result[match.name] = file;
-        }
-      }
-    }
-    return result;
-  }();
-  const cache = new LMDBLiteCache(cacheDir);
+  });
 
   // Get requestTracker
   let requestTracker;
-  if (requestGraphBlob) {
+  if (requestGraphBlob != null && requestGraphKey != null) {
     try {
       var _cacheInfo$get;
-      let requestGraphKey = requestGraphBlob.slice(0, -'-0'.length);
       let date = Date.now();
+      const buffer = await cache.getBlob(requestGraphBlob);
+      const deserializer = new (_v().default.Deserializer)(buffer);
+      console.log('Wire format version stored', deserializer.getWireFormatVersion());
       let {
         requestGraph,
         bufferLength
-      } = await readAndDeserializeRequestGraph(cache, requestGraphKey, requestGraphKey.replace('requestGraph-', ''));
+      } = await readAndDeserializeRequestGraph(cache, requestGraphBlob, requestGraphKey);
       requestTracker = new RequestTracker({
         graph: requestGraph,
         // $FlowFixMe
@@ -111,16 +93,16 @@ async function loadGraphs(cacheDir) {
       cacheInfo.set('RequestGraph', [bufferLength]);
       (_cacheInfo$get = cacheInfo.get('RequestGraph')) === null || _cacheInfo$get === void 0 || _cacheInfo$get.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Request Graph\n', e);
+      console.error('Error loading Request Graph\n', e);
     }
   }
 
   // Get bundleGraph
   let bundleGraph;
-  if (bundleGraphBlob) {
+  if (bundleGraphBlob != null) {
     try {
       var _cacheInfo$get2;
-      let file = await cache.getLargeBlob(_path().default.basename(bundleGraphBlob).slice(0, -'-0'.length));
+      let file = await cache.getBlob(bundleGraphBlob);
       let timeToDeserialize = Date.now();
       let obj = _v().default.deserialize(file);
       (0, _assert().default)(obj.bundleGraph != null);
@@ -129,17 +111,17 @@ async function loadGraphs(cacheDir) {
       cacheInfo.set('BundleGraph', [Buffer.byteLength(file)]);
       (_cacheInfo$get2 = cacheInfo.get('BundleGraph')) === null || _cacheInfo$get2 === void 0 || _cacheInfo$get2.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Bundle Graph\n', e);
+      console.error('Error loading Bundle Graph\n', e);
     }
   }
 
   // Get assetGraph
   let assetGraph;
-  if (assetGraphBlob) {
+  if (assetGraphBlob != null) {
     try {
       var _cacheInfo$get3;
       // TODO: this should be reviewed when `cachePerformanceImprovements` flag is removed, as we'll be writing files to LMDB cache instead of large blobs
-      let file = await cache.getLargeBlob(_path().default.basename(assetGraphBlob).slice(0, -'-0'.length));
+      let file = await cache.getBlob(assetGraphBlob);
       let timeToDeserialize = Date.now();
       let obj = _v().default.deserialize(file);
       (0, _assert().default)(obj.assetGraph != null);
@@ -148,7 +130,7 @@ async function loadGraphs(cacheDir) {
       cacheInfo.set('AssetGraph', [Buffer.byteLength(file)]);
       (_cacheInfo$get3 = cacheInfo.get('AssetGraph')) === null || _cacheInfo$get3 === void 0 || _cacheInfo$get3.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Asset Graph\n', e);
+      console.error('Error loading Asset Graph\n', e);
     }
   }
   function getSubRequests(id) {
@@ -170,7 +152,7 @@ async function loadGraphs(cacheDir) {
       bundleInfo = (0, _nullthrows().default)(writeBundlesRequest.result);
     }
   } catch (e) {
-    console.log('Error loading bundleInfo\n', e);
+    console.error('Error loading bundleInfo\n', e);
   }
   return {
     assetGraph,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/query",
-  "version": "2.14.9",
+  "version": "2.14.10",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -18,8 +18,8 @@
   },
   "main": "src/index.js",
   "dependencies": {
-    "@atlaspack/cache": "3.2.4",
-    "@atlaspack/core": "2.17.4",
+    "@atlaspack/cache": "3.2.5",
+    "@atlaspack/core": "2.18.0",
     "@atlaspack/graph": "3.4.7",
     "nullthrows": "^1.1.1",
     "table": "^6.8.1",

package/src/index.js

@@ -3,8 +3,6 @@
 import type {ContentKey, NodeId} from '@atlaspack/graph';
 import type {PackagedBundleInfo} from '@atlaspack/core/src/types';
 
-import fs from 'fs';
-import path from 'path';
 import v8 from 'v8';
 import nullthrows from 'nullthrows';
 import invariant from 'assert';
@@ -27,65 +25,51 @@ export async function loadGraphs(cacheDir: string): Promise<{|
   bundleInfo: ?Map<ContentKey, PackagedBundleInfo>,
   cacheInfo: ?Map<string, Array<string | number>>,
 |}> {
-  function getMostRecentCacheBlobs() {
-    let files = fs.readdirSync(cacheDir);
-
-    let result = {};
-
-    let blobsToFind: Array<{|
-      name: string,
-      check: (v: string) => boolean,
-      mtime?: Date,
-    |}> = [
-      {
-        name: 'requestGraphBlob',
-        check: (basename) =>
-          basename.startsWith('requestGraph-') &&
-          !basename.startsWith('requestGraph-nodes'),
-      },
-      {
-        name: 'bundleGraphBlob',
-        check: (basename) => basename.endsWith('BundleGraph-0'),
-      },
-      {
-        name: 'assetGraphBlob',
-        check: (basename) => basename.endsWith('AssetGraph-0'),
-      },
-    ];
-
-    for (let file of files) {
-      let basename = path.basename(file);
-      let match = blobsToFind.find(({check}) => check(basename));
-
-      if (match) {
-        let stat = fs.statSync(path.join(cacheDir, file));
-
-        if (!match.mtime || stat.mtime > match.mtime) {
-          match.mtime = stat.mtime;
-          result[match.name] = file;
-        }
-      }
+  let cacheInfo: Map<string, Array<string | number>> = new Map();
+  const cache = new LMDBLiteCache(cacheDir);
+
+  let requestGraphBlob;
+  let requestGraphKey;
+  let bundleGraphBlob;
+  let assetGraphBlob;
+  for (let key of cache.keys()) {
+    if (key.startsWith('Asset/')) {
+      continue;
+    } else if (key.startsWith('PackagerRunner/')) {
+      continue;
     }
 
-    return result;
+    if (key.startsWith('RequestTracker/') && key.endsWith('/RequestGraph')) {
+      requestGraphBlob = key;
+      requestGraphKey = key.split('/').slice(0, -1).join('/');
+    }
+    if (key.startsWith('BundleGraph/')) {
+      bundleGraphBlob = key;
+    }
+    if (key.startsWith('AssetGraph/')) {
+      assetGraphBlob = key;
+    }
   }
 
-  let cacheInfo: Map<string, Array<string | number>> = new Map();
-
-  let {requestGraphBlob, bundleGraphBlob, assetGraphBlob} =
-    getMostRecentCacheBlobs();
-  const cache = new LMDBLiteCache(cacheDir);
+  console.log({requestGraphBlob, bundleGraphBlob, assetGraphBlob});
 
   // Get requestTracker
   let requestTracker;
-  if (requestGraphBlob) {
+  if (requestGraphBlob != null && requestGraphKey != null) {
     try {
-      let requestGraphKey = requestGraphBlob.slice(0, -'-0'.length);
       let date = Date.now();
+
+      const buffer = await cache.getBlob(requestGraphBlob);
+      const deserializer = new v8.Deserializer(buffer);
+      console.log(
+        'Wire format version stored',
+        deserializer.getWireFormatVersion(),
+      );
+
       let {requestGraph, bufferLength} = await readAndDeserializeRequestGraph(
         cache,
+        requestGraphBlob,
         requestGraphKey,
-        requestGraphKey.replace('requestGraph-', ''),
       );
 
       requestTracker = new RequestTracker({
@@ -99,17 +83,15 @@ export async function loadGraphs(cacheDir: string): Promise<{|
       cacheInfo.set('RequestGraph', [bufferLength]);
       cacheInfo.get('RequestGraph')?.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Request Graph\n', e);
+      console.error('Error loading Request Graph\n', e);
     }
   }
 
   // Get bundleGraph
   let bundleGraph;
-  if (bundleGraphBlob) {
+  if (bundleGraphBlob != null) {
     try {
-      let file = await cache.getLargeBlob(
-        path.basename(bundleGraphBlob).slice(0, -'-0'.length),
-      );
+      let file = await cache.getBlob(bundleGraphBlob);
 
       let timeToDeserialize = Date.now();
       let obj = v8.deserialize(file);
@@ -120,18 +102,16 @@ export async function loadGraphs(cacheDir: string): Promise<{|
       cacheInfo.set('BundleGraph', [Buffer.byteLength(file)]);
       cacheInfo.get('BundleGraph')?.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Bundle Graph\n', e);
+      console.error('Error loading Bundle Graph\n', e);
     }
   }
 
   // Get assetGraph
   let assetGraph;
-  if (assetGraphBlob) {
+  if (assetGraphBlob != null) {
     try {
       // TODO: this should be reviewed when `cachePerformanceImprovements` flag is removed, as we'll be writing files to LMDB cache instead of large blobs
-      let file = await cache.getLargeBlob(
-        path.basename(assetGraphBlob).slice(0, -'-0'.length),
-      );
+      let file = await cache.getBlob(assetGraphBlob);
 
       let timeToDeserialize = Date.now();
       let obj = v8.deserialize(file);
@@ -142,7 +122,7 @@ export async function loadGraphs(cacheDir: string): Promise<{|
       cacheInfo.set('AssetGraph', [Buffer.byteLength(file)]);
       cacheInfo.get('AssetGraph')?.push(timeToDeserialize);
     } catch (e) {
-      console.log('Error loading Asset Graph\n', e);
+      console.error('Error loading Asset Graph\n', e);
     }
   }
 
@@ -179,7 +159,7 @@ export async function loadGraphs(cacheDir: string): Promise<{|
       >);
     }
   } catch (e) {
-    console.log('Error loading bundleInfo\n', e);
+    console.error('Error loading bundleInfo\n', e);
   }
 
   return {assetGraph, bundleGraph, requestTracker, bundleInfo, cacheInfo};