IndexedDB

src/Core/ExceptionCode.js

@@ -30,4 +30,5 @@ export default //const ExceptionCode =
     SetPropertyDenied: 27,
     ReadOnlyProperty: 28,
     GeneralFailure: 29,
+    AddToStoreFailed: 30
 };

src/Data/Structure.js

@@ -45,6 +45,15 @@ export default class Structure
         return rt;
     }
 
+    toObject()
+    {
+        var rt = {};
+        for (var i in this)
+            if (!(this[i] instanceof Function))
+                rt[i] = this[i];
+        return rt;
+    }
+
     constructor(data)
     {
         if (data instanceof Object)

src/Net/IIP/DistributedConnection.js

@@ -1112,13 +1112,14 @@ export default class DistributedConnection extends IStore {
 
                             var resource = new (Function.prototype.bind.apply(type, values));
 
-                            Warehouse.put(resource, name, store, parent);
+                            Warehouse.put(resource, name, store, parent).then(function(ok){
-
+                                self.sendReply(IIPPacketAction.CreateResource, callback)
-
-                            self.sendReply(IIPPacketAction.CreateResource, callback)
                                 .addUint32(resource.Instance.Id)
                                 .done();
-
+                            }).error(function(ex){
+                                // send some error
+                                self.sendError(ErrorType.Management, callback, ExceptionCode.AddToStoreFailed);
+                            });
                         });
                     });
                 });
@@ -1662,14 +1663,32 @@ export default class DistributedConnection extends IStore {
 
                     // ClassId, ResourceAge, ResourceLink, Content
                     if (resource == null)
-                        Warehouse.put(dr, id.toString(), self, null, tmp);
+                    {
-
+                        Warehouse.put(dr, id.toString(), self, null, tmp).then(function(ok){
-                    Codec.parsePropertyValueArray(rt[3], 0, rt[3].length, self).then(function (ar) {
+                            Codec.parsePropertyValueArray(rt[3], 0, rt[3].length, self).then(function (ar) {
-                        dr._attach(ar);
+                                dr._attach(ar);
-                        self.resourceRequests.remove(id);
+                                self.resourceRequests.remove(id);
-                        reply.trigger(dr);
+                                reply.trigger(dr);
-                    });
+                            });
+                        }).error(function(ex){
+                            reply.triggerError(ex);
+                        });
+                    }
+                    else
+                    {
+                        Codec.parsePropertyValueArray(rt[3], 0, rt[3].length, self).then(function (ar) {
+                            dr._attach(ar);
+                            self.resourceRequests.remove(id);
+                            reply.trigger(dr);
+                        }).error(function(ex){
+                            reply.triggerError(ex);
+                        });
+                    }
+                }).error(function(ex){
+                    reply.triggerError(ex);
                 });
+            }).error(function(ex){
+                reply.triggerError(ex);
             });
 
         return reply;

src/Resource/Warehouse.js

@@ -217,10 +217,7 @@ export class WH extends IEventHandler
         }
 
         if (resource instanceof IStore)
-        {
             this.stores.add(resource);
-            this._emit("connected", resource);
-        }
         else
             await store.put(resource);
 
@@ -234,6 +231,9 @@ export class WH extends IEventHandler
                 await resource.trigger(ResourceTrigger.Open);
         }
 
+        if (resource instanceof IStore)
+            this._emit("connected", resource);
+
         return new AsyncReply(true);
     }
 
@@ -388,12 +388,9 @@ export class WH extends IEventHandler
         for (var i = 0; i < this.resources.length; i++)
         {
             var r = this.resources.at(i);
-            console.log("init ", r);
 
             var rt = await r.trigger(ResourceTrigger.Initialize);
 
-            console.log("init done", r);
-
             if (!rt)
                 console.log(`Resource failed at Initialize ${r.Instance.Name} [${r.Instance.Template.ClassName}]`);
         }

src/Stores/IndexDBStore.js

@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2017-2021 Ahmed Kh. Zamil
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-/**
- * Created by Ahmed Zamil on 2/18/2021.
- */
-
-"use strict";  
-
-import { ResourceTrigger } from '../Resource/IResource.js';
-import IStore from '../Resource/IStore.js'
-import AsyncReply from '../Core/AsyncReply.js';
-
-export default class IndexDBStore extends IStore
- {
-     constructor()
-     {
-         super();
-     }
-
-     put(resource)
-     {
-        let rt = new AsyncReply();
-
-        var transaction = this.db.transaction(["resources"], "readwrite");
-        var objectStore = transaction.objectStore("resources");
-
-        // copy resource data
-        let props = resource.instance.template.properties;
-        
-        var snap = {};
-        for(var i = 0; i < props.length; i++)
-            snap[props[i].name] = resource[props[i].name];
-
-        // debugger;
-
-        var request = objectStore.add(snap);
-
-        request.onerror = function(event) {
-            rt.trigger(null);
-        };
-
-        request.onsuccess = function(event) {
-            rt.trigger(request.result);
-        };
-
-        return rt;
-     }
-
-     retrive(id)
-     {
-        let rt = new AsyncReply();
-
-        var transaction = this.db.transaction(["resources"]);
-        var objectStore = transaction.objectStore("resources");
-        var request = objectStore.get(id);
-
-        request.onerror = function(event) {
-            rt.trigger(null);
-        };
-
-        request.onsuccess = function(event) {
-            rt.trigger(request.result);
-        };
-
-        return rt;
-     }
-
-     get(resource)
-     {
-         return new AsyncReply(null);
-     }
-
-     link(resource)
-     {
-        if (resource.instance.store == this)
-            return this.instance.name + "/" + resource.id;
-     }
-
-     trigger(trigger)
-     {
-         if (trigger == ResourceTrigger.Initialize)
-         {
-            let dbName = this.instance.attributes.item("db") ?? "esiur";
-            let request = indexedDB.open(dbName, 3);
-            let self = this;
-            let rt = new AsyncReply();
-            
-            request.onupgradeneeded = function(event) {
-                self._store = request.result.createObjectStore("resources", {keyPath: "id", autoIncrement: true});
-                console.log(self._store);
-              };
-            
-            request.onerror = function(event) {
-                console.error("Database error: " + event.target.errorCode);
-                rt.trigger(false);
-            };
-
-            request.onsuccess = function(event) {
-                console.log(event);
-                self.db = request.result;
-                rt.trigger(true);
-            };
-              
-            return rt;
-         }
-
-         return new AsyncReply(true);
-     }
-
-     record(resource, propertyName, value, age, dateTime)
-     {
-
-     }
-
-     getRecord(resource, fromDate, toDate)
-     {
-
-     }
- }

src/Stores/IndexedDBStore.js

@@ -0,0 +1,357 @@
+/*
+* Copyright (c) 2017-2021 Ahmed Kh. Zamil
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+/**
+ * Created by Ahmed Zamil on 2/18/2021.
+ */
+
+"use strict";  
+
+import { ResourceTrigger } from '../Resource/IResource.js';
+import IStore from '../Resource/IStore.js'
+import AsyncReply from '../Core/AsyncReply.js';
+import Codec from '../Data/Codec.js';
+import Warehouse from '../Resource/Warehouse.js';
+import DataType from '../Data/DataType.js';
+
+export default class IndexedDBStore extends IStore
+ {
+     constructor()
+     {
+         super();
+         this.resources = new Map();
+         this.classes = new Map();
+     }
+
+     compose(value)
+     {
+         let type = Codec.getDataType(value, null);
+
+         switch (type)
+         {
+             case DataType.Void:
+                 // nothing to do;
+                 return null;
+
+             case DataType.String:
+                 return value;
+
+             case DataType.Resource:
+             case DataType.DistributedResource:
+                 return  { "type": 0 , "link": value.instance.link };
+
+             case DataType.Structure:
+                 return this.composeStructure(value);
+
+             case DataType.VarArray:
+                 return this.composeVarArray(value);
+
+             case DataType.ResourceArray:
+                 return this.composeResourceArray(value);
+
+             case DataType.StructureArray:
+                 return this.composeStructureArray(value);
+
+             default:
+                 return value;
+         }
+     }
+
+     parse(value)
+     {
+        if (value instanceof Array)
+        {
+            let bag = new AsyncBag();
+
+            for(let i = 0; i < value.length; i++)
+                bag.add(this.parse(value[i]));
+
+            bag.seal();
+
+            return bag;
+        }
+        else if (value?.type !== undefined)
+        {
+             if (value.type == 0)
+             {
+                 return Warehouse.get(value.link);
+             } // structure
+             else if (value.type == 1)
+             {
+                 var bag = new AsyncBag();
+                 var rt = new AsyncReply();
+
+                 let s = new Structure();
+
+                 for (let i = 0; i < value.values.length; i++)
+                     bag.add(this.parse(value.values[i].value));
+
+                 bag.seal();
+                 bag.then((x) =>
+                 {
+                     for (let i = 0; i < x.Length; i++)
+                         s[value.values[i].name] = x[i];
+
+                     rt.trigger(s);
+                 });
+
+                 return rt;
+             }
+             else
+                 return new AsyncReply(null);
+         }
+         else
+         {
+             return new AsyncReply(value);
+         }
+     }
+
+
+     addClass(type)
+     {
+         let template = type.template;
+         let className = template.namespace + "." + type.prototype.constructor.name;
+         this.classes.set(className, type);
+     }
+     
+     async fetch(id)
+     {
+         if (this.resources.has(id))
+             return new AsyncReply(this.resources.get(id));
+         
+        let rt = new AsyncReply();
+
+        var transaction = this.db.transaction(["resources"]);
+        var objectStore = transaction.objectStore("resources");
+        var request = objectStore.get(id);
+
+        request.onerror = function(event) {
+            rt.trigger(null);
+        };
+
+        request.onsuccess = async function(event) {
+            var doc = request.result;
+            
+            if (!this.classes.has(doc.className))
+            {
+                rt.triggerError(0, 0, "Class not found");
+                return;
+            }
+
+            //let r = await Warehouse.new(, doc.name, this, null, null, this);
+            let type = this.classes.get(doc.className);
+            var proxyType = ResourceProxy.getProxy(type);
+            var resource = new proxyType();
+            this.resources.set(doc._id, resource);
+
+            await Warehouse.put(resource, doc.name, this, null, null, null, null);
+
+            var attributes = await parse(doc.attributes);
+            resource.instance.setAttributes(attributes);
+
+            
+            // Apply store managers
+            for (var i = 0; i < this.instance.managers.length; i++)
+                resource.instance.managers.add(this.instance.managers[i]);
+
+            // Load values
+
+            for(var i = 0; i < doc.values.length; i++)
+            {
+                let v = doc.values[i];
+                var x = await this.parse(v.value);
+                resource.instance.loadProperty(v.name, v.age, v.modification, x);
+            }
+
+            rt.trigger(resource);
+        };
+
+        return rt;
+     }
+
+     put(resource)
+     {
+        let rt = new AsyncReply();
+
+        var transaction = this.db.transaction(["resources"], "readwrite");
+        var objectStore = transaction.objectStore("resources");
+
+
+        let attrs = resource.instance.getAttributes();
+
+        var record = {
+            className: resource.instance.template.className,
+            name: resource.instance.name,
+            attributes: this.composeStructure(attrs),
+            _id: resource._id // if it has an Id will be replaced
+        };
+
+        // copy resource data
+        let props = resource.instance.template.properties;
+        
+        var snap = {};
+        for(var i = 0; i < props.length; i++)
+        {
+            let pt = props[i];
+            snap[pt.name] = { "age": resource.instance.getAge(pt.index),
+                                    "modification": resource.instance.getModificationDate(pt.index),
+                                    "value": this.compose(resource[pt.name]) 
+                              };
+        }
+
+        record.values = snap;
+
+        //snap[props[i].name] = resource[props[i].name];
+
+        // debugger;
+
+        var request = objectStore.put(snap);
+
+        request.onerror = function(event) {
+            rt.trigger(false);
+        };
+
+        request.onsuccess = function(event) {
+            resource["_id"] = request.result;
+            rt.trigger(true);
+        };
+
+        return rt;
+     }
+
+    //  retrive(id)
+    //  {
+    //     let rt = new AsyncReply();
+
+    //     var transaction = this.db.transaction(["resources"]);
+    //     var objectStore = transaction.objectStore("resources");
+    //     var request = objectStore.get(id);
+
+    //     request.onerror = function(event) {
+    //         rt.trigger(null);
+    //     };
+
+    //     request.onsuccess = function(event) {
+    //         rt.trigger(request.result);
+    //     };
+
+    //     return rt;
+    //  }
+  
+    get(path)
+    {
+        var p = path.split('/');
+        if (p.length == 2)
+            if (p[0] == "id")
+            {
+                // load from Id
+                return this.fetch(p[1]);
+            }
+
+        return new AsyncReply(null);
+    }
+
+
+     link(resource)
+     {
+        if (resource.instance.store == this)
+            return this.instance.name + "/" + resource._id;
+     }
+
+     trigger(trigger)
+     {
+         if (trigger == ResourceTrigger.Initialize)
+         {
+            let dbName = this.instance.attributes.item("db") ?? "esiur";
+            let request = indexedDB.open(dbName, 3);
+            let self = this;
+            let rt = new AsyncReply();
+            
+            request.onupgradeneeded = function(event) {
+                self._store = request.result.createObjectStore("resources", {keyPath: "_id", autoIncrement: true});
+                console.log(self._store);
+              };
+            
+            request.onerror = function(event) {
+                console.error("Database error: " + event.target.errorCode);
+                rt.trigger(false);
+            };
+
+            request.onsuccess = function(event) {
+                console.log(event);
+                self.db = request.result;
+                rt.trigger(true);
+            };
+              
+            return rt;
+         }
+
+         return new AsyncReply(true);
+     }
+
+     record(resource, propertyName, value, age, dateTime)
+     {
+
+     }
+
+     getRecord(resource, fromDate, toDate)
+     {
+
+     }
+
+
+     composeStructure(value)
+     {
+         return {type: 1, values: value.toObject()};
+     }
+
+     composeVarArray(array)
+     {
+         var rt = [];
+
+         for (var i = 0; i < array.length; i++)
+             rt.push(this.compose(array[i]));
+         return rt;
+     }
+
+     composeStructureArray(structures)
+     {
+        var rt = [];
+
+        if (structures == null || structures.Length == 0)
+             return rt;
+
+        for(var i = 0; i < structures.length; i++)
+            rt.push(this.composeStructure(structures[s]));
+    
+         return rt;
+     }
+
+     composeResourceArray(array)
+     {
+         var rt = [];
+         for (var i = 0; i < array.length; i++)
+             rt.push({ "type": 0 , "link": array[i].instance.link });
+         return rt;
+     }
+
+ }

src/esiur.js

@@ -3,7 +3,7 @@ import wh from './Resource/Warehouse.js';
 import Structure from './Data/Structure.js';
 import DistributedResource from './Net/IIP/DistributedResource.js'
 import MemoryStore from './Stores/MemoryStore.js';
-import IndexedDBStore from './Stores/IndexDBStore.js';
+import IndexedDBStore from './Stores/IndexedDBStore.js';
 import IResource from './Resource/IResource.js';
 import ResourceProxy from './Proxy/ResourceProxy.js';