@functionland/react-native-fula 1.55.11 → 1.55.15

package/react-native-fula.podspec

@@ -1,47 +1,47 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
-Pod::Spec.new do |s|
-  s.name         = "react-native-fula"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => "13.0" }
-  s.source       = { :git => "https://github.com/functionland/react-native-fula.git", :tag => "v#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,mm,swift}"
-
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-  s.dependency "React-Core"
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
-  end   
-  s.dependency 'Fula','~> 1.54.16'
-  s.dependency "Wnfs",  "1.1.1"
-  s.dependency 'CryptoSwift', '~> 1.7.1'
-  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-
-end
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-fula"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "15.0" }
+  s.source       = { :git => "https://github.com/functionland/react-native-fula.git", :tag => "v#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+  s.dependency "React-Core"
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+   end
+  end
+  s.dependency 'Fula','~> 1.55.15'
+  s.dependency "Wnfs",  "1.1.1"
+  s.dependency 'CryptoSwift', '~> 1.7.1'
+  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+
+end

package/src/interfaces/fulaNativeModule.ts

@@ -1,175 +1,177 @@
-import { NativeModules, Platform } from 'react-native';
-
-interface FulaNativeModule {
-  registerLifecycleListener: () => Promise<void>;
-  initFula: (
-    identity: string, //Private key of did identity
-    storePath: string, //You can leave empty
-    bloxAddr: string, //Blox multiadddr needs to be manually entered now
-    exchange: string, //set to 'noope' for testing
-    autoFlush: boolean, //set to false always unless you know what you are doing. This is to write actions to disk explicitly after each write
-    rootCid: string | null, //if you have the latest rootCid you can send it and it generates the private_ref for filesystem
-    useRelay: boolean | null, // if true it forces the use of relay
-    refresh: boolean // if true it forces to refresh the fula object
-  ) => Promise<{ peerId: string; rootCid: string }>;
-  newClient: (
-    identity: string, //Private key of did identity
-    storePath: string, //You can leave empty
-    bloxAddr: string, //Blox multiadddr needs to be manually entered now
-    exchange: string, //set to 'noope' for testing
-    autoFlush: boolean, //set to false always unless you know what you are doing. This is to write actions to disk explicitly after each write
-    useRelay: boolean | null, // if true it forces the use of relay
-    refresh: boolean // if true it forces to refresh the fula object
-  ) => Promise<string>;
-  isReady: (filesystemCheck: boolean) => Promise<boolean>;
-  logout: (identity: string, storePath: string) => Promise<boolean>;
-  checkFailedActions: (retry: boolean, timeout: number) => Promise<boolean>;
-  listFailedActions: (cids: string[]) => Promise<string[]>;
-  listRecentCidsAsString: () => Promise<string[]>;
-  listRecentCidsAsStringWithChildren: () => Promise<string[]>;
-  clearCidsFromRecent: (cids: string[]) => Promise<boolean>;
-  checkConnection: (timeout: number) => Promise<boolean>;
-  get: (key: string) => Promise<string>;
-  has: (key: Uint8Array) => Promise<boolean>;
-  push: () => Promise<string>;
-  put: (content: string, codec: string) => Promise<string>;
-  mkdir: (path: string) => Promise<string>;
-  writeFileContent: (path: string, content: string) => Promise<string>;
-  writeFile: (
-    fulaTargetFilename: string,
-    localFilename: string
-  ) => Promise<string>;
-  ls: (path: string) => Promise<string>;
-  rm: (path: string) => Promise<string>;
-  cp: (sourcePath: string, targetPath: string) => Promise<string>;
-  mv: (sourcePath: string, targetPath: string) => Promise<string>;
-  readFile: (
-    fulaTargetFilename: string,
-    localFilename: string
-  ) => Promise<string>;
-  readFileContent: (path: string) => Promise<string>;
-  setAuth: (peerId: string, allow: boolean) => Promise<boolean>;
-
-  shutdown: () => Promise<void>;
-
-  testData: (identity: string, bloxAddr: string) => Promise<string>;
-
-  //Blockchain related functions
-  createAccount: (seed: string) => Promise<string>;
-  checkAccountExists: (account: string) => Promise<string>;
-  accountFund: (account: string) => Promise<string>;
-  createPool: (seed: string, poolName: string) => Promise<string>;
-  listPools: () => Promise<string>;
-  joinPool: (poolID: string) => Promise<string>;
-  leavePool: (poolID: string) => Promise<string>;
-  cancelPoolJoin: (poolID: string) => Promise<string>;
-  listPoolJoinRequests: (poolID: string) => Promise<string>;
-  votePoolJoinRequest: (
-    seed: string,
-    poolID: number,
-    account: string,
-    accept: boolean
-  ) => Promise<string>;
-  batchUploadManifest: (
-    cid: string[],
-    poolID: string,
-    replicationFactor: string
-  ) => Promise<string>;
-  replicateInPool: (
-    cid: string[],
-    account: string,
-    poolID: string
-  ) => Promise<string>;
-  newStoreRequest: (
-    seed: string,
-    poolID: number,
-    uploader: string,
-    cid: string
-  ) => Promise<string>;
-  listAvailableReplicationRequests: (poolID: string) => Promise<string>;
-  removeReplicationRequest: (
-    seed: string,
-    poolID: number,
-    cid: string
-  ) => Promise<string>;
-  removeStorer: (
-    seed: string,
-    storer: string,
-    poolID: number,
-    cid: string
-  ) => Promise<string>;
-  removeStoredReplication: (
-    seed: string,
-    uploader: string,
-    poolID: number,
-    cid: string
-  ) => Promise<string>;
-
-  //On Blox calls for chain
-  //Hardware
-  assetsBalance: (
-    account: string,
-    assetId: string,
-    classId: string
-  ) => Promise<string>;
-  transferToFula: (
-    amount: string,
-    wallet: string,
-    chain: string
-  ) => Promise<string>;
-  getAccount: () => Promise<string>;
-
-  //Hardware
-  eraseBlData: () => Promise<string>;
-  fetchContainerLogs: (
-    containerName: string,
-    tailCount: string
-  ) => Promise<string>;
-  findBestAndTargetInLogs: (
-    containerName: string,
-    tailCount: string
-  ) => Promise<string>;
-  getFolderSize: (folderPath: string) => Promise<string>;
-  getDatastoreSize: () => Promise<string>;
-  bloxFreeSpace: () => Promise<string>;
-  wifiRemoveall: () => Promise<string>;
-  reboot: () => Promise<string>;
-  partition: () => Promise<string>;
-
-  // Plugin related functions
-  listPlugins: () => Promise<string>;
-  listActivePlugins: () => Promise<string>;
-  installPlugin: (pluginName: string, params: string) => Promise<string>;
-  uninstallPlugin: (pluginName: string) => Promise<string>;
-  showPluginStatus: (pluginName: string, lines: number) => Promise<string>;
-  getInstallOutput: (pluginName: string, params: string) => Promise<string>;
-  getInstallStatus: (pluginName: string) => Promise<string>;
-  updatePlugin: (pluginName: string) => Promise<string>;
-  deleteDsLock: () => Promise<void>;
-
-  //AI
-  chatWithAI: (aiModel: string, userMessage: string) => Promise<string>;
-  getChatChunk: (streamID: string) => Promise<string>;
-  streamChunks: (streamID: string) => Promise<void>;
-
-  
-}
-
-const LINKING_ERROR =
-  `The package 'react-native-fula/Fula' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo managed workflow\n';
-
-const Fula = NativeModules.FulaModule
-  ? NativeModules.FulaModule
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
-
-export default Fula as FulaNativeModule;
+import { NativeModules, Platform } from 'react-native';
+
+interface FulaNativeModule {
+  registerLifecycleListener: () => Promise<void>;
+  initFula: (
+    identity: string, //Private key of did identity
+    storePath: string, //You can leave empty
+    bloxAddr: string, //Blox multiadddr needs to be manually entered now
+    exchange: string, //set to 'noope' for testing
+    autoFlush: boolean, //set to false always unless you know what you are doing. This is to write actions to disk explicitly after each write
+    rootCid: string | null, //if you have the latest rootCid you can send it and it generates the private_ref for filesystem
+    useRelay: boolean | null, // if true it forces the use of relay
+    refresh: boolean // if true it forces to refresh the fula object
+  ) => Promise<{ peerId: string; rootCid: string }>;
+  newClient: (
+    identity: string, //Private key of did identity
+    storePath: string, //You can leave empty
+    bloxAddr: string, //Blox multiadddr needs to be manually entered now
+    exchange: string, //set to 'noope' for testing
+    autoFlush: boolean, //set to false always unless you know what you are doing. This is to write actions to disk explicitly after each write
+    useRelay: boolean | null, // if true it forces the use of relay
+    refresh: boolean // if true it forces to refresh the fula object
+  ) => Promise<string>;
+  isReady: (filesystemCheck: boolean) => Promise<boolean>;
+  logout: (identity: string, storePath: string) => Promise<boolean>;
+  checkFailedActions: (retry: boolean, timeout: number) => Promise<boolean>;
+  listFailedActions: (cids: string[]) => Promise<string[]>;
+  listRecentCidsAsString: () => Promise<string[]>;
+  listRecentCidsAsStringWithChildren: () => Promise<string[]>;
+  clearCidsFromRecent: (cids: string[]) => Promise<boolean>;
+  checkConnection: (timeout: number) => Promise<boolean>;
+  get: (key: string) => Promise<string>;
+  has: (key: Uint8Array) => Promise<boolean>;
+  push: () => Promise<string>;
+  put: (content: string, codec: string) => Promise<string>;
+  mkdir: (path: string) => Promise<string>;
+  writeFileContent: (path: string, content: string) => Promise<string>;
+  writeFile: (
+    fulaTargetFilename: string,
+    localFilename: string
+  ) => Promise<string>;
+  ls: (path: string) => Promise<string>;
+  rm: (path: string) => Promise<string>;
+  cp: (sourcePath: string, targetPath: string) => Promise<string>;
+  mv: (sourcePath: string, targetPath: string) => Promise<string>;
+  readFile: (
+    fulaTargetFilename: string,
+    localFilename: string
+  ) => Promise<string>;
+  readFileContent: (path: string) => Promise<string>;
+  setAuth: (peerId: string, allow: boolean) => Promise<boolean>;
+
+  shutdown: () => Promise<void>;
+
+  testData: (identity: string, bloxAddr: string) => Promise<string>;
+
+  //Blockchain related functions
+  createAccount: (seed: string) => Promise<string>;
+  checkAccountExists: (account: string) => Promise<string>;
+  accountFund: (account: string) => Promise<string>;
+  createPool: (seed: string, poolName: string) => Promise<string>;
+  listPools: () => Promise<string>;
+  joinPool: (poolID: string) => Promise<string>;
+  leavePool: (poolID: string) => Promise<string>;
+  joinPoolWithChain: (poolID: string, chainName: string) => Promise<string>;
+  leavePoolWithChain: (poolID: string, chainName: string) => Promise<string>;
+  cancelPoolJoin: (poolID: string) => Promise<string>;
+  listPoolJoinRequests: (poolID: string) => Promise<string>;
+  votePoolJoinRequest: (
+    seed: string,
+    poolID: number,
+    account: string,
+    accept: boolean
+  ) => Promise<string>;
+  batchUploadManifest: (
+    cid: string[],
+    poolID: string,
+    replicationFactor: string
+  ) => Promise<string>;
+  replicateInPool: (
+    cid: string[],
+    account: string,
+    poolID: string
+  ) => Promise<string>;
+  newStoreRequest: (
+    seed: string,
+    poolID: number,
+    uploader: string,
+    cid: string
+  ) => Promise<string>;
+  listAvailableReplicationRequests: (poolID: string) => Promise<string>;
+  removeReplicationRequest: (
+    seed: string,
+    poolID: number,
+    cid: string
+  ) => Promise<string>;
+  removeStorer: (
+    seed: string,
+    storer: string,
+    poolID: number,
+    cid: string
+  ) => Promise<string>;
+  removeStoredReplication: (
+    seed: string,
+    uploader: string,
+    poolID: number,
+    cid: string
+  ) => Promise<string>;
+
+  //On Blox calls for chain
+  //Hardware
+  assetsBalance: (
+    account: string,
+    assetId: string,
+    classId: string
+  ) => Promise<string>;
+  transferToFula: (
+    amount: string,
+    wallet: string,
+    chain: string
+  ) => Promise<string>;
+  getAccount: () => Promise<string>;
+
+  //Hardware
+  eraseBlData: () => Promise<string>;
+  fetchContainerLogs: (
+    containerName: string,
+    tailCount: string
+  ) => Promise<string>;
+  findBestAndTargetInLogs: (
+    containerName: string,
+    tailCount: string
+  ) => Promise<string>;
+  getFolderSize: (folderPath: string) => Promise<string>;
+  getDatastoreSize: () => Promise<string>;
+  bloxFreeSpace: () => Promise<string>;
+  wifiRemoveall: () => Promise<string>;
+  reboot: () => Promise<string>;
+  partition: () => Promise<string>;
+
+  // Plugin related functions
+  listPlugins: () => Promise<string>;
+  listActivePlugins: () => Promise<string>;
+  installPlugin: (pluginName: string, params: string) => Promise<string>;
+  uninstallPlugin: (pluginName: string) => Promise<string>;
+  showPluginStatus: (pluginName: string, lines: number) => Promise<string>;
+  getInstallOutput: (pluginName: string, params: string) => Promise<string>;
+  getInstallStatus: (pluginName: string) => Promise<string>;
+  updatePlugin: (pluginName: string) => Promise<string>;
+  deleteDsLock: () => Promise<void>;
+
+  //AI
+  chatWithAI: (aiModel: string, userMessage: string) => Promise<string>;
+  getChatChunk: (streamID: string) => Promise<string>;
+  streamChunks: (streamID: string) => Promise<void>;
+
+
+}
+
+const LINKING_ERROR =
+  `The package 'react-native-fula/Fula' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo managed workflow\n';
+
+const Fula = NativeModules.FulaModule
+  ? NativeModules.FulaModule
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      }
+    );
+
+export default Fula as FulaNativeModule;

package/src/protocols/blockchain.ts

@@ -182,6 +182,78 @@ export const leavePool = (poolID: number): Promise<BType.PoolLeaveResponse> => {
   return res1;
 };
 
+/*
+joinPoolWithChain: This function takes two arguments: poolID and chainName. The poolID is the ID of the pool to join, and the chainName specifies the blockchain network to use for the operation. The function returns a promise of an object that contains the account and poolID.
+*/
+export const joinPoolWithChain = (poolID: number, chainName: string): Promise<BType.PoolJoinResponse> => {
+  console.log('joinPoolWithChain in react-native started', poolID, chainName);
+
+  // Validate inputs
+  if (typeof poolID !== 'number' || poolID <= 0) {
+    return Promise.reject(new Error('Pool ID must be a positive number'));
+  }
+
+  if (typeof chainName !== 'string' || chainName.trim().length === 0) {
+    return Promise.reject(new Error('Chain name must be a non-empty string'));
+  }
+
+  let res1 = Fula.joinPoolWithChain(poolID.toString(), chainName.trim())
+    .then((res) => {
+      try {
+        let jsonRes: BType.PoolJoinResponse = JSON.parse(res);
+        return jsonRes;
+      } catch (e) {
+        try {
+          return JSON.parse(res);
+        } catch (e2) {
+          console.error('Error parsing res in joining pool with chain:', e);
+          return res; // Return raw response if parsing fails
+        }
+      }
+    })
+    .catch((err) => {
+      console.error('Error joining pool with chain:', err);
+      throw err; // Rethrow the error to maintain the rejection state
+    });
+  return res1;
+};
+
+/*
+leavePoolWithChain: This function takes two arguments: poolID and chainName. The poolID is the ID of the pool to leave, and the chainName specifies the blockchain network to use for the operation. The function returns a promise of an object that contains the account and poolID.
+*/
+export const leavePoolWithChain = (poolID: number, chainName: string): Promise<BType.PoolLeaveResponse> => {
+  console.log('leavePoolWithChain in react-native started', poolID, chainName);
+
+  // Validate inputs
+  if (typeof poolID !== 'number' || poolID <= 0) {
+    return Promise.reject(new Error('Pool ID must be a positive number'));
+  }
+
+  if (typeof chainName !== 'string' || chainName.trim().length === 0) {
+    return Promise.reject(new Error('Chain name must be a non-empty string'));
+  }
+
+  let res1 = Fula.leavePoolWithChain(poolID.toString(), chainName.trim())
+    .then((res) => {
+      try {
+        let jsonRes: BType.PoolLeaveResponse = JSON.parse(res);
+        return jsonRes;
+      } catch (e) {
+        try {
+          return JSON.parse(res);
+        } catch (e2) {
+          console.error('Error parsing res in leaving pool with chain:', e);
+          return res; // Return raw response if parsing fails
+        }
+      }
+    })
+    .catch((err) => {
+      console.error('Error leaving pool with chain:', err);
+      throw err; // Rethrow the error to maintain the rejection state
+    });
+  return res1;
+};
+
 export const cancelPoolJoin = (
   poolID: number
 ): Promise<BType.PoolCancelJoinResponse> => {