Merge pull request #1437 from Phala-Network/fix-jssdk-connect

fix(jssdk): the default connection is incorrect.
Phala-Network · Nov 14, 2023 · 521fd07 · 521fd07
2 parents 356c954 + 1405053
commit 521fd07
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/frontend/packages/sdk/package.json b/frontend/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@phala/sdk",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Phala Phat Contract JS SDK",
   "license": "Apache-2.0",
   "author": [

diff --git a/frontend/packages/sdk/src/OnChainRegistry.ts b/frontend/packages/sdk/src/OnChainRegistry.ts
@@ -119,13 +119,28 @@ export class OnChainRegistry {
     // We should ensure the wasm & api has been initialized here.
     await Promise.all([cryptoWaitReady(), api.isReady])
     if (options.autoConnect) {
-      await instance.connect(
-        options.clusterId,
-        options.workerId,
-        options.pruntimeURL,
-        options.systemContractId,
-        !!options.skipCheck
-      )
+      if (!options.clusterId && !options.workerId && !options.pruntimeURL) {
+        await instance.connect()
+      }
+      // If user specified the pruntimeURL, it should use it first.
+      else if (options.pruntimeURL) {
+        const workerInfo: PartialWorkerInfo = {
+          clusterId: options.clusterId,
+          pruntimeURL: options.pruntimeURL,
+        }
+        await instance.connect(workerInfo)
+      }
+      // Failed back to backward compatible mode.
+      else {
+        console.warn('Failed back to legacy connection mode, please use pruntimeURL instead.')
+        await instance.connect(
+          options.clusterId,
+          options.workerId,
+          options.pruntimeURL,
+          options.systemContractId,
+          !!options.skipCheck
+        )
+      }
     }
     return instance
   }