@spyglassmc/core 0.4.25 → 0.4.26

package/lib/service/CacheService.d.ts

@@ -35,14 +35,12 @@ export declare class CacheService {
     private readonly project;
     checksums: Checksums;
     errors: ErrorCache;
-    dirtyFiles: Set<string>;
     /**
      * @param cacheRoot File path to the directory where cache files by Spyglass should be stored.
      * @param project
      */
     constructor(cacheRoot: RootUriString, project: Project);
     private getCacheFileUri;
-    private flushDirtyFiles;
     load(): Promise<LoadResult>;
     validate(): Promise<ValidateResult>;
     /**

package/lib/service/CacheService.js

@@ -18,7 +18,6 @@ export class CacheService {
     project;
     checksums = Checksums.create();
     errors = {};
-    dirtyFiles = new Set();
     #hasValidatedFiles = false;
     /**
      * @param cacheRoot File path to the directory where cache files by Spyglass should be stored.
@@ -31,9 +30,14 @@ export class CacheService {
             if (!this.#hasValidatedFiles) {
                 return;
             }
-            this.dirtyFiles.add(doc.uri);
-            if (this.dirtyFiles.size > 100) {
-                await this.flushDirtyFiles();
+            try {
+                // TODO: Don't update this for every single change.
+                this.checksums.files[doc.uri] = await this.project.externals.crypto.getSha1(doc.getText());
+            }
+            catch (e) {
+                if (!this.project.externals.error.isKind(e, 'EISDIR')) {
+                    this.project.logger.error(`[CacheService#hash-file] ${doc.uri}`);
+                }
             }
         });
         this.project.on('rootsUpdated', async ({ roots }) => {
@@ -46,7 +50,7 @@ export class CacheService {
                 }
                 catch (e) {
                     if (!this.project.externals.error.isKind(e, 'EISDIR')) {
-                        this.project.logger.error(`[CacheService#hash-root] ${root}`, e);
+                        this.project.logger.error(`[CacheService#hash-root] ${root}`);
                     }
                 }
             }
@@ -69,19 +73,6 @@ export class CacheService {
         }
         return this.#cacheFilePath;
     }
-    async flushDirtyFiles() {
-        for (const uri of this.dirtyFiles) {
-            try {
-                this.checksums.files[uri] = await this.project.fs.hash(uri);
-            }
-            catch (e) {
-                if (!this.project.externals.error.isKind(e, 'EISDIR')) {
-                    this.project.logger.error(`[CacheService#flushDirtyFiles] ${uri}`, e);
-                }
-            }
-        }
-        this.dirtyFiles.clear();
-    }
     async load() {
         const ans = { symbols: {} };
         if (this.project.projectRoots.length === 0) {
@@ -129,7 +120,7 @@ export class CacheService {
             }
             catch (e) {
                 if (!this.project.externals.error.isKind(e, 'EISDIR')) {
-                    this.project.logger.error(`[CacheService#hash-file] ${uri}`, e);
+                    this.project.logger.error(`[CacheService#hash-file] ${uri}`);
                 }
                 // Failed calculating hash. Assume the root has changed.
             }
@@ -183,8 +174,6 @@ export class CacheService {
         let filePath;
         try {
             filePath = await this.getCacheFileUri();
-            await this.flushDirtyFiles();
-            __profiler.task('Hash Files');
             const cache = {
                 version: LatestCacheVersion,
                 projectRoots: this.project.projectRoots,

package/lib/service/Project.js

@@ -22,7 +22,7 @@ import { ArchiveUriSupporter, FileService, FileUriSupporter } from './FileServic
 import { fileUtil } from './fileUtil.js';
 import { MetaRegistry } from './MetaRegistry.js';
 import { ProfilerFactory } from './Profiler.js';
-const CacheAutoSaveInterval = 300_000; // 5 Minutes.
+const CacheAutoSaveInterval = 600_000; // 10 Minutes.
 /* istanbul ignore next */
 /**
  * Manage all tracked documents and errors.
@@ -65,7 +65,7 @@ export class Project {
     static RootSuffix = '/pack.mcmeta';
     /** Prevent circular binding. */
     #bindingInProgressUris = new Set();
-    #cacheSaverIntervalId = undefined;
+    #cacheSaverIntervalId;
     cacheService;
     /** URI of files that are currently managed by the language client. */
     #clientManagedUris = new Set();
@@ -182,6 +182,7 @@ export class Project {
         }).on('error', ({ error, uri }) => this.logger.error(`[Project] [Config] Failed loading ${uri}`, error));
         this.setInitPromise();
         this.setReadyPromise();
+        this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
         this.on('documentUpdated', ({ doc, node }) => {
             // if (!this.#isReady) {
             // 	return
@@ -386,9 +387,6 @@ export class Project {
             __profiler.task('Bind Files');
             __profiler.finalize();
             this.emit('ready', {});
-            // Save the cache after ready and start the auto-cache interval
-            await this.cacheService.save();
-            this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
         };
         this.#isReady = false;
         this.#readyPromise = ready();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.25",
+  "version": "0.4.26",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",