Merge pull request #29 from SaitoTech/develop

wasm bug fixing

index.node.ts

@@ -1,4 +1,4 @@
-import Saito from "./saito";
+import Saito, {LogLevel} from "./saito";
 import SharedMethods from "./shared_methods";
 import Transaction from "./lib/transaction";
 import Slip from "./lib/slip";
@@ -21,12 +21,16 @@ if (NODE_MAJOR_VERSION < 19) {
  *
  * @param configs
  * @param sharedMethods
+ * @param factory
+ * @param privateKey
+ * @param logLevel
  */
 export async function initialize(
  configs: any,
  sharedMethods: SharedMethods,
  factory: Factory,
- privateKey: string
+ privateKey: string,
+ logLevel: LogLevel = LogLevel.Info
 ) {
  if (Saito.getLibInstance()) {
  console.error("saito already initialized");
@@ -52,7 +56,7 @@ export async function initialize(
  PeerServiceList.Type = s.WasmPeerServiceList;
  // Config.Type = s.WasmConfiguration;
 
- return Saito.initialize(configs, sharedMethods, factory, privateKey);
+ return Saito.initialize(configs, sharedMethods, factory, privateKey, logLevel);
 }
 
 export default Saito;

index.web.ts

@@ -1,4 +1,4 @@
-import Saito from "./saito";
+import Saito, {LogLevel} from "./saito";
 import SharedMethods from "./shared_methods";
 import Transaction from "./lib/transaction";
 import Slip from "./lib/slip";
@@ -16,12 +16,16 @@ import PeerServiceList from "./lib/peer_service_list";
  *
  * @param configs
  * @param sharedMethods
+ * @param factory
+ * @param privateKey
+ * @param logLevel
  */
 export async function initialize(
  configs: any,
  sharedMethods: SharedMethods,
  factory: Factory,
- privateKey: string
+ privateKey: string,
+ logLevel: LogLevel = LogLevel.Info
 ) {
  if (Saito.getLibInstance()) {
  console.error("saito already initialized");
@@ -51,7 +55,7 @@ export async function initialize(
  console.log("init output = ", s);
  Saito.setWasmMemory(s.memory);
 
- return Saito.initialize(configs, sharedMethods, factory, privateKey);
+ return Saito.initialize(configs, sharedMethods, factory, privateKey, logLevel);
  });
 }
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "saito-js",
- "version": "0.0.26",
+ "version": "0.0.27",
  "description": "js wrappings around saito-core using wasm",
  "scripts": {
  "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register 'tests/**/*.ts'",
@@ -29,7 +29,7 @@
  "dependencies": {
  "buffer": "^6.0.3",
  "cookie-parser": "~1.4.6",
- "saito-wasm": "^0.0.15",
+ "saito-wasm": "^0.0.16",
  "cors": "^2.8.5",
  "debug": "^4.3.4",
  "express": "~4.18.2",

saito.ts

@@ -25,6 +25,14 @@ import Blockchain from "./lib/blockchain";
 // ApplicationTransaction,
 // }
 
+export enum LogLevel {
+ Error = 0,
+ Warn,
+ Info,
+ Debug,
+ Trace,
+}
+
 export default class Saito {
  private static instance: Saito;
  private static libInstance: any;
@@ -41,7 +49,8 @@ export default class Saito {
  configs: any,
  sharedMethods: SharedMethods,
  factory = new Factory(),
- privateKey: string
+ privateKey: string,
+ logLevel: LogLevel
  ) {
  console.log("initializing saito lib");
  Saito.instance = new Saito(factory);
@@ -117,7 +126,7 @@ export default class Saito {
  }
 
  let configStr = JSON.stringify(configs);
- await Saito.getLibInstance().initialize(configStr, privateKey);
+ await Saito.getLibInstance().initialize(configStr, privateKey, logLevel);
 
  console.log("saito initialized");
  }