bruce-models 2.0.9 → 2.1.1

package/dist/lib/common/cache.js

@@ -11,246 +11,125 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheControl = void 0;
 const localforage_1 = require("localforage");
-const object_utils_1 = require("../util/object-utils");
-class CacheDictionary {
+const CACHE_VERSION_PREFIX = "v2_";
+class CacheUtil {
     constructor(id) {
-        this.memory = Object.create(null);
-        if (!id) {
-            id = "BRUCE_UI_MODELS_CACHE_DICT_" + object_utils_1.ObjectUtils.UId();
-        }
-        this.id = id;
         this.store = localforage_1.default.createInstance({
-            name: id
+            name: CACHE_VERSION_PREFIX + id,
         });
+        this.inMemoryPromises = {};
+        this.keyVersions = {};
     }
-    get Id() {
-        return this.id;
-    }
-    GetItems() {
+    Set(key, value, duration = 300000) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.items == null) {
-                const raw = yield this.store.getItem(this.id);
-                if (raw == null) {
-                    this.items = [];
-                }
-                else {
-                    // Check if any are expired.
-                    // We can clean this every first time we load.
-                    const now = new Date().getTime();
-                    for (const item of raw) {
-                        if (item.duration > -1 && (now - item.created) / 1000 > item.duration) {
-                            if (item.inMemory) {
-                                this.memory[item.key] = null;
-                                delete this.memory[item.key];
-                            }
-                            else {
-                                yield this.store.removeItem(item.key);
-                            }
-                        }
+            if (value instanceof Promise) {
+                this.inMemoryPromises[key] = value;
+                const currentVersion = (this.keyVersions[key] = (this.keyVersions[key] || 0) + 1);
+                value
+                    .then((resolvedValue) => {
+                    if (this.keyVersions[key] === currentVersion) {
+                        this.Set(key, resolvedValue, duration);
                     }
-                    this.items = raw;
-                }
-            }
-            return this.items;
-        });
-    }
-    GetKeys() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.GetItems()).map(x => "" + x.key);
-        });
-    }
-    Set(key, value, duration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            key = "" + key;
-            const items = yield this.GetItems();
-            const itemIndex = items.findIndex(x => x.key == key);
-            if (itemIndex > -1) {
-                const item = items[itemIndex];
-                if (item.inMemory) {
-                    this.memory[item.key] = null;
-                    delete this.memory[item.key];
-                }
-                else {
-                    yield this.store.removeItem(item.key);
-                }
-                items.splice(itemIndex, 1);
-            }
-            const item = {
-                key: key,
-                duration: duration,
-                created: new Date().getTime(),
-                inMemory: false
-            };
-            // Short duration, keep in memory.
-            if (duration < 60) {
-                item.inMemory = true;
-                this.memory[item.key] = value;
-            }
-            // Let's resolve and store the value in local-storage.
-            // If resolution crashes then we'll keep retaining that in memory.
-            else if (value instanceof Promise) {
-                value.then((x) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const items = yield this.GetItems();
-                        const item = items.find(x => x.key == key);
-                        if (!item) {
-                            console.log("Item was removed from cache before promise resolved.", key, items);
-                            return;
-                        }
-                        try {
-                            yield this.store.setItem(item.key, x);
-                            item.inMemory = false;
-                            this.memory[item.key] = null;
-                            delete this.memory[item.key];
-                            yield this.store.setItem(this.id, items);
-                        }
-                        catch (e) {
-                            console.warn(e);
-                        }
+                })
+                    .catch((error) => {
+                    if (this.keyVersions[key] === currentVersion) {
+                        this.Set(key, error, duration);
                     }
-                    catch (e) {
-                        console.warn(e);
-                    }
-                }));
-                item.inMemory = true;
-                this.memory[item.key] = value;
+                })
+                    .finally(() => {
+                    delete this.inMemoryPromises[key];
+                });
             }
-            if (!item.inMemory) {
-                try {
-                    yield this.store.setItem(item.key, value);
-                }
-                catch (e) {
-                    item.inMemory = true;
-                    this.memory[item.key] = value;
-                    console.warn(e);
-                }
+            else {
+                const item = {
+                    value,
+                    expiry: Date.now() + duration,
+                };
+                yield this.store.setItem(key, item);
             }
-            items.push(item);
-            yield this.store.setItem(this.id, items);
-            this.items = items;
         });
     }
-    Remove(key) {
+    Get(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            key = "" + key;
-            const items = yield this.GetItems();
-            const index = items.findIndex(x => x.key == key);
-            if (index >= 0) {
-                const item = items[index];
-                if (item.inMemory) {
-                    this.memory[item.key] = null;
-                    delete this.memory[item.key];
-                }
-                else {
-                    this.store.removeItem(item.key);
-                }
-                items.splice(index, 1);
-                this.store.setItem(this.id, items);
+            if (this.inMemoryPromises[key]) {
+                return this.inMemoryPromises[key];
             }
-            this.items = items;
-        });
-    }
-    Clear() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const items = yield this.GetItems();
-            for (const item of items) {
-                if (item.inMemory) {
-                    this.store.removeItem(item.key);
-                }
+            const item = (yield this.store.getItem(key));
+            if (!item) {
+                return null;
             }
-            this.store.setItem(this.id, []);
-            this.items = [];
-            this.memory = Object.create(null);
+            if (Date.now() > item.expiry) {
+                yield this.store.removeItem(key);
+                return null;
+            }
+            return item.value;
         });
     }
-    GetData(key) {
+    ClearCache(pattern, mode = "equals") {
         return __awaiter(this, void 0, void 0, function* () {
-            key = "" + key;
-            const item = (yield this.GetItems()).find(x => x.key == key);
-            const isExpired = item == null || item.duration > -1 && (new Date().getTime() - item.created) / 1000 > item.duration;
-            if (isExpired) {
-                this.Remove(key);
-                return null;
+            const keys = yield this.store.keys();
+            const checkFuncs = {
+                equals: (key) => key === pattern,
+                contains: (key) => key.includes(pattern),
+                startswith: (key) => key.startsWith(pattern),
+            };
+            const check = checkFuncs[mode];
+            if (!check) {
+                throw new Error("Invalid mode");
             }
-            if (item.inMemory) {
-                return this.memory[item.key];
+            for (const key of keys) {
+                if (check(key)) {
+                    yield this.store.removeItem(key);
+                }
             }
-            const raw = yield this.store.getItem(item.key);
-            if (raw == null) {
-                return null;
+            for (const key in this.inMemoryPromises) {
+                if (check(key)) {
+                    delete this.inMemoryPromises[key];
+                    this.keyVersions[key]++;
+                }
             }
-            return raw;
         });
     }
 }
 class CacheControl {
     constructor(id) {
         this.Disabled = false;
-        this.data = new CacheDictionary(id);
+        this.data = new CacheUtil(id);
     }
     /**
      * @param id
      * @param data
      * @param duration seconds to keep the data in cache. -1 for infinite.
      */
-    Set(id, data, duration = -1) {
+    Set(id, data, duration = 300) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.data.Set(id, data, duration);
+            const durationMs = duration === -1 ? undefined : duration * 1000;
+            return this.data.Set(String(id), data, durationMs);
         });
     }
     Get(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.data.GetData(id);
+            return (yield this.data.Get(String(id)));
         });
     }
     Clear() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.data.Clear();
+            return this.data.ClearCache("");
         });
     }
     Remove(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.data.Remove(id);
+            return this.data.ClearCache(String(id), "equals");
         });
     }
     RemoveByStartsWith(text) {
         return __awaiter(this, void 0, void 0, function* () {
-            const items = [...(yield this.data.GetItems())];
-            for (const item of items) {
-                if (item.key.startsWith(text)) {
-                    yield this.data.Remove(item.key);
-                }
-            }
+            return this.data.ClearCache(text, "startswith");
         });
     }
     RemoveByContains(text) {
         return __awaiter(this, void 0, void 0, function* () {
-            const items = [...(yield this.data.GetItems())];
-            for (const item of items) {
-                if (item.key.includes(text)) {
-                    yield this.data.Remove(item.key);
-                }
-            }
-        });
-    }
-    GetKeys() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.Disabled) {
-                return [];
-            }
-            const items = yield this.data.GetItems();
-            return items.map(x => x.key);
-        });
-    }
-    GetValues() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.Disabled) {
-                return [];
-            }
-            const items = yield this.data.GetItems();
-            const keys = items.map(x => x.key);
-            const values = yield Promise.all(keys.map(key => this.data.GetData(key)));
-            return values.filter(x => x != null);
+            return this.data.ClearCache(text, "contains");
         });
     }
 }

package/dist/lib/common/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/common/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/common/cache.ts"],"names":[],"mappings":"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"}

package/dist/lib/entity/entity.js

@@ -20,24 +20,34 @@ const path_utils_1 = require("../util/path-utils");
  */
 var Entity;
 (function (Entity) {
-    function GetCacheKey(entityId, expandLocation) {
-        return `${api_1.Api.ECacheKey.Entity}${api_1.Api.ECacheKey.Id}${entityId}${String(Boolean(expandLocation))}`;
+    function GetCacheKey(entityId, entityTypeId, expandLocation) {
+        if (!entityTypeId) {
+            entityTypeId = "";
+        }
+        return `${api_1.Api.ECacheKey.Entity}${api_1.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}`;
     }
     Entity.GetCacheKey = GetCacheKey;
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { api, entityId, req: reqParams, expandLocation } = params;
+            const { api, entityId, req: reqParams, expandLocation, entityTypeId } = params;
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
-            const key = GetCacheKey(entityId, expandLocation);
+            const key = GetCacheKey(entityId, entityTypeId, expandLocation);
             const cacheData = yield api.GetCacheItem(key, reqParams);
             if (cacheData) {
                 return cacheData;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`entity/${entityId}${expandLocation ? "?$expand=location" : ""}`, api_1.Api.PrepReqParams(reqParams));
+                    const urlParams = new URLSearchParams();
+                    if (expandLocation) {
+                        urlParams.append("$expand", "location");
+                    }
+                    if (entityTypeId) {
+                        urlParams.append("BruceEntityType", entityTypeId);
+                    }
+                    const data = yield api.GET(`entity/${entityId}?${urlParams.toString()}`, api_1.Api.PrepReqParams(reqParams));
                     res({
                         entity: data
                     });

package/dist/lib/entity/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/entity/entity.ts"],"names":[],"mappings":"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"}

package/dist/types/common/cache.d.ts

@@ -14,7 +14,5 @@ export declare class CacheControl<T> {
     Remove(id: Key): Promise<void>;
     RemoveByStartsWith(text: string): Promise<void>;
     RemoveByContains(text: string): Promise<void>;
-    GetKeys(): Promise<string[]>;
-    GetValues(): Promise<any[]>;
 }
 export {};

package/dist/types/entity/entity.d.ts

@@ -14,7 +14,7 @@ declare type _any = any;
  * Entity records have many thinks linked to them through their UIDs such as links, files and relationships.
  */
 export declare namespace Entity {
-    function GetCacheKey(entityId: string, expandLocation?: boolean): string;
+    function GetCacheKey(entityId: string, entityTypeId?: string, expandLocation?: boolean): string;
     interface IEntity extends _any {
         Bruce: {
             "CreatedBy.User.ID"?: string;
@@ -34,6 +34,7 @@ export declare namespace Entity {
     function Get(params: {
         api: BruceApi.Api;
         entityId: string;
+        entityTypeId?: string;
         expandLocation?: boolean;
         req?: Api.IReqParams;
     }): Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bruce-models",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "description": "",
   "keywords": [],
   "main": "dist/bruce-models.umd.js",