SetSync

bin/esiur.cjs

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+
+console.log("Esiur Shell");
+console.log("\t use: 'await wh.get(url, <attributes>);' to get a resource.");
+
+const { spawn } = require("child_process");
+const { pathToFileURL } = require("url");
+
+let url = pathToFileURL(__dirname).href + '/../src/esiur.js';
+
+spawn('node', ["-i", "-e", `import('${url}');`], {
+  stdio: 'inherit'
+});

build/esiur.js

@@ -2680,7 +2680,7 @@ var DataDeserializer = /*#__PURE__*/function () {
     value: function resourceParser(data, offset, length, connection, requestSequence) {
       if (connection != null) {
         var id = data.getUint32(offset, requestSequence);
-        return connection.fetch(id);
+        return connection.fetch(id, requestSequence);
       }
 
       throw Error("Can't parse resource with no connection");
@@ -6507,7 +6507,7 @@ var DistributedConnection = /*#__PURE__*/function (_IStore) {
   }, {
     key: "put",
     value: function put(resource) {
-      if (_Codec["default"].isLocalResource(resource, this)) this._neededResources.add(resource._p.id, resource);
+      if (_Codec["default"].isLocalResource(resource, this)) this._neededResources.add(resource._p.instanceId, resource);
       return new _AsyncReply["default"](true);
     }
   }, {
@@ -7624,9 +7624,9 @@ var DistributedConnection = /*#__PURE__*/function (_IStore) {
       var request = this.resourceRequests.item(id);
 
       if (request != null) {
-        var _requestSequence$cont;
+        var _requestSequence$incl;
 
-        if (resource != null && ((_requestSequence$cont = requestSequence === null || requestSequence === void 0 ? void 0 : requestSequence.contains(id)) !== null && _requestSequence$cont !== void 0 ? _requestSequence$cont : false)) return new _AsyncReply["default"](resource);else return request;
+        if (resource != null && ((_requestSequence$incl = requestSequence === null || requestSequence === void 0 ? void 0 : requestSequence.includes(id)) !== null && _requestSequence$incl !== void 0 ? _requestSequence$incl : false)) return new _AsyncReply["default"](resource);else return request;
       } else if (resource != null && !resource._p.suspended) {
         // @REVIEW: this should never happen
         console.log("DCON", LogType.Error, "Resource not moved to attached.");
@@ -8254,6 +8254,10 @@ var _PropertyValue = _interopRequireDefault(require("../../Data/PropertyValue.js
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -8394,12 +8398,43 @@ var DistributedResource = /*#__PURE__*/function (_IResource) {
         };
 
         var makeSetter = function makeSetter(index) {
-          return function (value) {
+          return /*#__PURE__*/function () {
-            if (self._p.destroyed) throw new Error("Trying to access a destroyed object.");
+            var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(value) {
-            if (self._p.suspended) throw new Error("Trying to access a suspended object.");
+              return regeneratorRuntime.wrap(function _callee$(_context) {
+                while (1) {
+                  switch (_context.prev = _context.next) {
+                    case 0:
+                      if (!self._p.destroyed) {
+                        _context.next = 2;
+                        break;
+                      }
 
-            self._set(index, value);
+                      throw new Error("Trying to access a destroyed object.");
-          };
+
+                    case 2:
+                      if (!self._p.suspended) {
+                        _context.next = 4;
+                        break;
+                      }
+
+                      throw new Error("Trying to access a suspended object.");
+
+                    case 4:
+                      _context.next = 6;
+                      return self._set(index, value);
+
+                    case 6:
+                    case "end":
+                      return _context.stop();
+                  }
+                }
+              }, _callee);
+            }));
+
+            return function (_x) {
+              return _ref.apply(this, arguments);
+            };
+          }();
         };
 
         for (var _i3 = 0; _i3 < this.instance.template.functions.length; _i3++) {
@@ -8482,7 +8517,9 @@ var DistributedResource = /*#__PURE__*/function (_IResource) {
       }
 
       if (this._p.neglect) return;
-      if (index >= this._p.properties.length) return null;
+      if (index >= this._p.properties.length) return null; // Awaiting null is not a problem in JS
+
+      if (this._p.properties[index] == value) return null;
       var reply = new _AsyncReply["default"]();
 
       var parameters = _Codec["default"].compose(value, this._p.connection);

package-lock.json

@@ -1,17 +1,21 @@
 {
   "name": "esiur",
-  "version": "2.0.0",
+  "version": "2.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "esiur",
-      "version": "2.0.0",
+      "version": "2.1.3",
       "license": "MIT",
       "dependencies": {
         "mongodb": "^3.6.9",
         "ws": "^7.5.0"
       },
+      "bin": {
+        "esiur": "bin/esiur.cjs",
+        "esiur2": "node -i -e \"import('./src/esiur.js');\""
+      },
       "devDependencies": {
         "@babel/core": "^7.14.6",
         "@babel/preset-env": "^7.14.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esiur",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Distributed Object Framework",
   "main": "esiur.js",
   "type": "module",
@@ -10,6 +10,9 @@
     "build": "browserify src/esiur.js -t babelify --outfile build/esiur.js",
     "prepublish": "browserify src/esiur.js -t babelify --outfile build/esiur.js"
   },
+  "bin": {
+    "esiur": "./bin/esiur.cjs"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/esiur/esiur-js.git"

src/Data/DataDeserializer.js

@@ -133,9 +133,10 @@ export default class DataDeserializer {
 
   static resourceParser(
       data, offset, length,  connection, requestSequence) {
+
     if (connection != null) {
       var id = data.getUint32(offset, requestSequence);
-      return connection.fetch(id);
+      return connection.fetch(id, requestSequence);
     }
     throw Error("Can't parse resource with no connection");
   }

src/Net/IIP/DistributedConnection.js

@@ -1262,7 +1262,7 @@ export default class DistributedConnection extends IStore {
 
     put(resource) {
         if (Codec.isLocalResource(resource, this))
-            this._neededResources.add(resource._p.id, resource);
+            this._neededResources.add(resource._p.instanceId, resource);
 
         return new AsyncReply(true);
     }
@@ -2541,7 +2541,7 @@ export default class DistributedConnection extends IStore {
         let request = this.resourceRequests.item(id);
 
         if (request != null) {
-            if (resource != null && (requestSequence?.contains(id) ?? false))
+            if (resource != null && (requestSequence?.includes(id) ?? false))
                 return new AsyncReply(resource);
             else
                 return request;

src/Net/IIP/DistributedResource.js

@@ -170,14 +170,14 @@ export default class DistributedResource extends IResource
 
             var makeSetter = function(index)
             {
-                return function (value) {
+                return async function (value) {
                     if (self._p.destroyed)
                         throw new Error("Trying to access a destroyed object.");
     
                     if (self._p.suspended)
                         throw new Error("Trying to access a suspended object.");
 
-                    self._set(index, value);
+                    await self._set(index, value);
                 };
             };
 
@@ -295,6 +295,10 @@ export default class DistributedResource extends IResource
         if (index >= this._p.properties.length)
             return null;
 
+        // Awaiting null is not a problem in JS
+        if (this._p.properties[index] == value)
+            return null;
+
         var reply = new AsyncReply();
 
         var parameters = Codec.compose(value, this._p.connection);

test/client.js

@@ -0,0 +1,7 @@
+import "../src/esiur.js";
+
+console.log("Starting test.");
+
+let service = await wh.get("iip://localhost/sys/service");
+
+console.log(service);