suidouble 1.0.4-7 → 1.0.5

package/README.md

@@ -168,7 +168,9 @@ while (events.hasNextPage) {
 
 ##### subscribing to events
 
-You can subscribe to Sui's contract events on package's module level. No types-etc filters for now ( @todo? )
+*** Subscribe to Events is deprecated in Sui SDK *** You should plan to use different architecture in your application.
+
+You can subscribe to Sui's contract events on package's module level. 
 
 ```javascript
 const module = await contract.getModule('suidouble_chat');

package/lib/SuiLocalTestValidator.js

@@ -1,7 +1,6 @@
-// const { spawn } = require('child_process');
+const net = require("net");
 const SuiCliCommands = require('./SuiCliCommands.js');
 const SuiCommonMethods = require('./SuiCommonMethods.js');
-// const { JsonRpcProvider, localnetConnection, devnetConnection } = require('@mysten/sui.js');
 
 const { SuiClient, getFullnodeUrl, SuiHTTPTransport } = require('@mysten/sui/client');
 const SuiUtils = require('./SuiUtils.js');
@@ -65,6 +64,51 @@ class SuiLocalTestValidator extends SuiCommonMethods {
         }
     }
 
+    async isPortThere(port) {
+        const Socket = net.Socket;
+        const socket = new Socket();
+
+        let __waitPortPromiseResolver = null;
+        const __waitPortPromise = new Promise((res)=>{ __waitPortPromiseResolver = res; });
+
+        setTimeout(()=>{
+            socket.destroy();
+            __waitPortPromiseResolver(false);
+        }, 3000);
+        socket.on("connect", () => {
+            __waitPortPromiseResolver(true);
+        });
+        socket.on("error", () =>
+        {
+            __waitPortPromiseResolver(false);
+        });
+        socket.on("timeout", () => {
+            __waitPortPromiseResolver(false);
+        });
+
+        socket.connect(port, "0.0.0.0");
+
+        const portIsThere = await __waitPortPromise;
+        socket.destroy();
+
+        return portIsThere;
+    }
+
+    async waitForPort(port, timeout) {
+        this.log('waiting for port', port);
+        const startedCheckingAt = (new Date()).getTime();
+        let portIsThere = false;
+        do {
+            portIsThere = await this.isPortThere(port);
+            this.log('checking for port', port, 'is there:', portIsThere);
+            if (!portIsThere) {
+                await new Promise((res)=>setTimeout(res, 500));
+            }
+        } while (!portIsThere && (startedCheckingAt + timeout) > ((new Date()).getTime()));
+
+        return portIsThere;
+    }
+
     async launch() {
         if (this._active) {
             return this;
@@ -73,12 +117,22 @@ class SuiLocalTestValidator extends SuiCommonMethods {
         this.log('launching sui-test-validator ...');
 
         try {
-            const params = [];
-            if (this._epochDuration) {
-                params.push('--epoch-duration-ms');
-                params.push(this._epochDuration);
+            try {
+                // try sui-test-validator
+                const params = [];
+                if (this._epochDuration) {
+                    params.push('--epoch-duration-ms');
+                    params.push(this._epochDuration);
+                }
+                this._child = await SuiCliCommands.spawn('sui-test-validator', params, { RUST_LOG: 'consensus=off' });
+            } catch (e) {
+                this.log('can not launch sui-test-validator. Trying to run "sui start"...');
+                const params = [];
+                params.push('start');
+                params.push('--with-faucet');
+                params.push('--force-regenesis');
+                this._child = await SuiCliCommands.spawn('sui', params, { RUST_LOG: 'off,sui_node=info' });
             }
-            this._child = await SuiCliCommands.spawn('sui-test-validator', params, { RUST_LOG: 'consensus=off' });
         } catch (e) {
             if (this._testFallbackEnabled) {
                 // can't start local node. Let's switch to sui:dev
@@ -93,29 +147,6 @@ class SuiLocalTestValidator extends SuiCommonMethods {
                 throw e;
             }
         }
-
-        this.__readyLaunchedPromiseResolver = null;
-        this.__readyLaunchedPromise = new Promise((res)=>{
-            this.__readyLaunchedPromiseResolver = res;
-        });
-
-        this._child.stdout.on('data', (data) => {
-            this.log(`stdout:\n${data}`);
-            if ((`${data}`).indexOf('Fullnode RPC URL') !== -1) {
-                this._active = true;
-
-                this.log('sui-test-validator launched');
-                this.__readyLaunchedPromiseResolver();
-            }
-        });
-        
-        this._child.stderr.on('data', (data) => {
-            this.log(`stderr: ${data}`);
-        });
-        
-        this._child.on('error', (error) => {
-            this.log(`error: ${error.message}`);
-        });
         
         this._child.on('close', (code) => {
             this._active = false;
@@ -131,7 +162,9 @@ class SuiLocalTestValidator extends SuiCommonMethods {
         process.on('SIGINT', cleanExit); // catch ctrl-c
         process.on('SIGTERM', cleanExit); // catch kill
 
-        await this.__readyLaunchedPromise;
+        this._active = await this.waitForPort(9123, 30000);
+
+        // await this.__readyLaunchedPromise;
 
         return this;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suidouble",
-  "version": "1.0.4-7",
+  "version": "1.0.5",
   "description": "Set of provider, package and object classes for javascript representation of Sui Move smart contracts. Use same code for publishing, upgrading, integration testing, interaction with smart contracts and integration in browser web3 dapps",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "author": "Jeka Kiselyov <jeka911@gmail.com> (https://github.com/jeka-kiselyov)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@mysten/sui": "^1.0.4",
+    "@mysten/sui": "1.0.5",
     "@wallet-standard/core": "^1.0.3",
     "websocket": "^1.0.35"
   },

package/test/sui_master_onlocal.test.js

@@ -152,33 +152,36 @@ test('can find a package on the blockchain by expected module name (in owned)',
     t.equal(contract.version, 2);
 });
 
-test('subscribe to module events', async t => {
-    const module = await contract.getModule('suidouble_chat');
-    await module.subscribeEvents();
+// Event websocket subscriptions are going to be deprecated.
+// test('subscribe to module events', async t => {
+//     const module = await contract.getModule('suidouble_chat');
+//     await module.subscribeEvents();
 
-    let gotEventChatTopMessageCreated = false;
-    let gotEventChatResponseCreated = false;
+//     let gotEventChatTopMessageCreated = false;
+//     let gotEventChatResponseCreated = false;
 
-    module.addEventListener('ChatTopMessageCreated', (event)=>{
-        gotEventChatTopMessageCreated = event;
-    });
-    module.addEventListener('ChatResponseCreated', (event)=>{
-        gotEventChatResponseCreated = event.detail; // .detail is reference to event itself. To support CustomEvent pattern
-    });
+//     module.addEventListener('ChatTopMessageCreated', (event)=>{
+//         gotEventChatTopMessageCreated = event;
+//     });
+//     module.addEventListener('ChatResponseCreated', (event)=>{
+//         gotEventChatResponseCreated = event.detail; // .detail is reference to event itself. To support CustomEvent pattern
+//     });
 
-    await contract.moveCall('suidouble_chat', 'post', [chatShopObjectId, contract.arg('string', 'the message'), contract.arg('string', 'metadata')]);
-    await new Promise((res)=>setTimeout(res, 300)); // got events without timeout, but just to be sure.
+//     await contract.moveCall('suidouble_chat', 'post', [chatShopObjectId, contract.arg('string', 'the message'), contract.arg('string', 'metadata')]);
+//     await new Promise((res)=>setTimeout(res, 300)); // got events without timeout, but just to be sure.
 
-    t.ok(gotEventChatTopMessageCreated);
-    t.ok(gotEventChatResponseCreated);
+//     t.ok(gotEventChatTopMessageCreated);
+//     t.ok(gotEventChatResponseCreated);
 
-    // just some checks that events have data by contract's architecture
-    t.ok(gotEventChatResponseCreated.parsedJson.top_message_id == gotEventChatTopMessageCreated.parsedJson.id);
-    t.ok(gotEventChatTopMessageCreated.parsedJson.top_response_id == gotEventChatResponseCreated.parsedJson.id);
+//     // just some checks that events have data by contract's architecture
+//     t.ok(gotEventChatResponseCreated.parsedJson.top_message_id == gotEventChatTopMessageCreated.parsedJson.id);
+//     t.ok(gotEventChatTopMessageCreated.parsedJson.top_response_id == gotEventChatResponseCreated.parsedJson.id);
 
-    // unsubscribing from events, to close websocket
-    await module.unsubscribeEvents();
-});
+//     // unsubscribing from events, to close websocket
+//     await module.unsubscribeEvents();
+
+//     t.end();
+// });
 
 test('execute contract methods', async t => {
     const moveCallResult = await contract.moveCall('suidouble_chat', 'post', [chatShopObjectId, contract.arg('string', 'the message'), contract.arg('string', 'metadata')]);

package/test/test_move_contracts/different_types/Move.lock

@@ -21,6 +21,6 @@ dependencies = [
 ]
 
 [move.toolchain-version]
-compiler-version = "1.25.1"
+compiler-version = "1.30.1"
 edition = "2024.beta"
 flavor = "sui"

package/test/test_move_contracts/suidouble_chat/Move.lock

@@ -22,6 +22,6 @@ dependencies = [
 ]
 
 [move.toolchain-version]
-compiler-version = "1.25.1"
-edition = "legacy"
+compiler-version = "1.30.1"
+edition = "2024.beta"
 flavor = "sui"