trac-peer 0.1.29 → 0.1.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "dependencies": {
     "assert": "npm:bare-node-assert",

package/src/contract.js

@@ -1,5 +1,3 @@
-import {AssertionError} from "bare-assert";
-
 class Contract {
 
     constructor(protocol, options = {}) {
@@ -10,6 +8,7 @@ class Contract {
         this.is_message = false;
         this.features = {};
         this.schemata = {};
+        this.funcs = {};
         this.message_handler = null;
         this.address = null;
         this.validator_address = null;
@@ -101,31 +100,33 @@ class Contract {
                 try {
                     _return = await this.message_handler();
                 } catch(e) {
-                    if(!(e instanceof AssertionError)){
+                    if(e.constructor.name !== 'AssertionError'){
                         throw new RethrownError('Error in contract.', e);
                     }
-                    _return = e.message;
+                    _return = e;
                 }
             }
-        } else {
+        } else if(this[this.op.type] !== undefined) {
             try {
-                if(this[this.op.type] !== undefined) {
-                    if(this.schemata[this.op.type] !== undefined){
-                        if(true === this.validateSchema(this.op.type, this.op)) {
-                            _return = await this[this.op.type]();
-                        } else {
-                            _return = false;
-                        }
-                    } else {
+                if(this.schemata[this.op.type] !== undefined){
+                    if(true === this.validateSchema(this.op.type, this.op)) {
                         _return = await this[this.op.type]();
+                    } else {
+                        _return = new UnknownContractOperationType('Invalid schema.');
                     }
+                } else if(this.funcs[this.op.type] !== undefined) {
+                    _return = await this[this.op.type]();
+                } else {
+                    _return = new UnknownContractOperationType('Function not registered.');
                 }
             } catch(e) {
-                if(!(e instanceof AssertionError)){
+                if(e.constructor.name !== 'AssertionError'){
                     throw new RethrownError('Error in contract.', e);
                 }
-                _return = e.message;
+                _return = e;
             }
+        } else {
+            _return = new UnknownContractOperationType('Unknown contract operation type.');
         }
 
         this.address = null;
@@ -145,6 +146,10 @@ class Contract {
         return result === true;
     }
 
+    register(type){
+        this.funcs[type] = true;
+    }
+
     addSchema(type, schema){
         this.schemata[type] = this.protocol.peer.check.validator.compile(schema);
     }
@@ -202,6 +207,12 @@ class Contract {
     }
 }
 
+class UnknownContractOperationType extends Error {
+    constructor(message) {
+        super(message);
+    }
+}
+
 class RethrownError extends Error {
     constructor(message, error){
         super(message)

package/src/index.js

@@ -115,6 +115,7 @@ export class Peer extends ReadyResource {
                             );
                             let _err = null;
                             if(null !== err) {
+                                if(err.constructor.name === 'UnknownContractOperationType') continue;
                                 _err = ''+err.message;
                             }
                             let len = await batch.get('txl');

package/src/protocol.js

@@ -164,7 +164,7 @@ class Protocol{
 
     getError(value){
         if (value === false || (value !== undefined && value.stack !== undefined && value.message !== undefined)) {
-            return value === false ? new Error('Generic Error') : value;
+            return value === false ? new Error('Error') : value;
         }
         return null;
     }