@steerprotocol/data-connector-loader 4.0.0 → 4.0.2

package/lib/bundle/bundleBase.d.ts

@@ -19,14 +19,15 @@ export declare class BundleBase {
     constructor(wasmFile: string | ArrayBuffer, _config: string, executionAppConfig: ExecutionAppConfig, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     load(): Promise<WasmModule>;
     loadSync(): WasmModule;
-    execute(response: string): Promise<string>;
+    execute(response?: string): Promise<string | null>;
     transform(): Promise<string>;
     executeBundle(data: Array<any>): Promise<string>;
     executeDynamicJobBundle(data: Array<any>): Promise<string>;
     reset(): void;
     setExecutionContextStrategyExecution(executionContext: ExecutionContext, forceDeposit?: boolean): void;
     setExecutionContextDataConnector(executionContext: ExecutionContext): void;
-    protected executeModule(response: string): Promise<string>;
+    protected executeModule(response: string): Promise<string | null>;
+    protected executeModuleWithResult(...params: Array<number | string | ArrayBuffer | null>): Promise<string | null>;
     getProvider(config: any): ethers.Provider | undefined;
     getResults(): string;
     version(): number;

package/lib/bundle/bundleBase.js

@@ -81,8 +81,7 @@ class BundleBase {
             // If the module is still not initialized, throw an error
             if (!this.module)
                 throw new Error('Module not initialized');
-            // Call the main function with the response
-            return yield this.module.execute(response);
+            return response === undefined ? yield this.executeModuleWithResult() : yield this.executeModuleWithResult(response);
         });
     }
     // For dynamic job data connector
@@ -124,8 +123,11 @@ class BundleBase {
             // If the module is still not initialized, throw an error
             if (!this.module)
                 throw new Error('Module not initialized');
-            // Call the main function with the response
-            return this.module.execute(...data);
+            const result = yield this.executeModuleWithResult(...data);
+            if (result === null) {
+                throw new Error('Module execution returned null');
+            }
+            return result;
         });
     }
     executeDynamicJobBundle(data) {
@@ -145,8 +147,11 @@ class BundleBase {
             // If the module is still not initialized, throw an error
             if (!this.module)
                 throw new Error('Module not initialized');
-            // Call the main function with the response
-            return this.module.execute(...data);
+            const result = yield this.executeModuleWithResult(...data);
+            if (result === null) {
+                throw new Error('Module execution returned null');
+            }
+            return result;
         });
     }
     reset() {
@@ -184,7 +189,15 @@ class BundleBase {
             if (!this.module) {
                 throw new Error('Module not initialized');
             }
-            return yield this.module.execute(response);
+            return yield this.executeModuleWithResult(response);
+        });
+    }
+    executeModuleWithResult(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.module) {
+                throw new Error('Module not initialized');
+            }
+            return yield this.module.execute(...params);
         });
     }
     // This function returns a provider based on the chainId of the request

package/lib/esm/bundle/bundleBase.d.ts

@@ -19,14 +19,15 @@ export declare class BundleBase {
     constructor(wasmFile: string | ArrayBuffer, _config: string, executionAppConfig: ExecutionAppConfig, identity?: ethers.Provider, etherRpcConfig?: EtherRpcConfig);
     load(): Promise<WasmModule>;
     loadSync(): WasmModule;
-    execute(response: string): Promise<string>;
+    execute(response?: string): Promise<string | null>;
     transform(): Promise<string>;
     executeBundle(data: Array<any>): Promise<string>;
     executeDynamicJobBundle(data: Array<any>): Promise<string>;
     reset(): void;
     setExecutionContextStrategyExecution(executionContext: ExecutionContext, forceDeposit?: boolean): void;
     setExecutionContextDataConnector(executionContext: ExecutionContext): void;
-    protected executeModule(response: string): Promise<string>;
+    protected executeModule(response: string): Promise<string | null>;
+    protected executeModuleWithResult(...params: Array<number | string | ArrayBuffer | null>): Promise<string | null>;
     getProvider(config: any): ethers.Provider | undefined;
     getResults(): string;
     version(): number;

package/lib/esm/bundle/bundleBase.js

@@ -66,8 +66,7 @@ export class BundleBase {
         // If the module is still not initialized, throw an error
         if (!this.module)
             throw new Error('Module not initialized');
-        // Call the main function with the response
-        return await this.module.execute(response);
+        return response === undefined ? await this.executeModuleWithResult() : await this.executeModuleWithResult(response);
     }
     // For dynamic job data connector
     async transform() {
@@ -105,8 +104,11 @@ export class BundleBase {
         // If the module is still not initialized, throw an error
         if (!this.module)
             throw new Error('Module not initialized');
-        // Call the main function with the response
-        return this.module.execute(...data);
+        const result = await this.executeModuleWithResult(...data);
+        if (result === null) {
+            throw new Error('Module execution returned null');
+        }
+        return result;
     }
     async executeDynamicJobBundle(data) {
         if (!this.executionContext) {
@@ -124,8 +126,11 @@ export class BundleBase {
         // If the module is still not initialized, throw an error
         if (!this.module)
             throw new Error('Module not initialized');
-        // Call the main function with the response
-        return this.module.execute(...data);
+        const result = await this.executeModuleWithResult(...data);
+        if (result === null) {
+            throw new Error('Module execution returned null');
+        }
+        return result;
     }
     reset() {
         if (this.module && this.module['reset']) {
@@ -159,7 +164,13 @@ export class BundleBase {
         if (!this.module) {
             throw new Error('Module not initialized');
         }
-        return await this.module.execute(response);
+        return await this.executeModuleWithResult(response);
+    }
+    async executeModuleWithResult(...params) {
+        if (!this.module) {
+            throw new Error('Module not initialized');
+        }
+        return await this.module.execute(...params);
     }
     // This function returns a provider based on the chainId of the request
     // The chainId is first checked in the data connector config, and if not found

package/lib/esm/execution/executionDataConnector.js

@@ -31,7 +31,10 @@ export class DataConnectorExecution extends ExecutionBase {
                 try {
                     const executionContext = await this.getExecutionContext(dataConnector, vaultConfig);
                     dataConnector.setExecutionContextDataConnector(executionContext);
-                    const initialRequest = await dataConnector.execute('');
+                    const initialRequest = await dataConnector.execute();
+                    if (initialRequest === null) {
+                        throw new Error('Data connector returned null request');
+                    }
                     const finalResponse = await this.handleRequestResponse(dataConnector, pluginManager, initialRequest);
                     const transformedData = await this.transformData(dataConnector, finalResponse);
                     transformationData.push(transformedData);
@@ -47,7 +50,7 @@ export class DataConnectorExecution extends ExecutionBase {
     async executeV2Bundle(dataConnector, vaultConfig) {
         const executionContext = await this.getExecutionContext(dataConnector, vaultConfig);
         dataConnector.setExecutionContextDataConnector(executionContext);
-        await dataConnector.execute('');
+        await dataConnector.execute();
         const result = await dataConnector.transform();
         return JSON.parse(result);
     }
@@ -62,7 +65,7 @@ export class DataConnectorExecution extends ExecutionBase {
             }
             const executionContext = await this.getExecutionContext(dataConnector, vaultConfig);
             dataConnector.setExecutionContextDataConnector(executionContext);
-            await dataConnector.execute('');
+            await dataConnector.execute();
             const result = await dataConnector.transform();
             transformationData.push(JSON.parse(result));
         }
@@ -87,7 +90,11 @@ export class DataConnectorExecution extends ExecutionBase {
                     await this.delay(1000);
                     response = await fetchData(parsedRequest, 0);
                 }
-                request = await dataConnector.execute(JSON.stringify(response));
+                const nextRequest = await dataConnector.execute(JSON.stringify(response));
+                if (nextRequest === null) {
+                    throw new Error('Data connector returned null request');
+                }
+                request = nextRequest;
             }
         }
         catch (e) {

package/lib/execution/executionDataConnector.js

@@ -44,7 +44,10 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
                     try {
                         const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
                         dataConnector.setExecutionContextDataConnector(executionContext);
-                        const initialRequest = yield dataConnector.execute('');
+                        const initialRequest = yield dataConnector.execute();
+                        if (initialRequest === null) {
+                            throw new Error('Data connector returned null request');
+                        }
                         const finalResponse = yield this.handleRequestResponse(dataConnector, pluginManager, initialRequest);
                         const transformedData = yield this.transformData(dataConnector, finalResponse);
                         transformationData.push(transformedData);
@@ -62,7 +65,7 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
         return __awaiter(this, void 0, void 0, function* () {
             const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
             dataConnector.setExecutionContextDataConnector(executionContext);
-            yield dataConnector.execute('');
+            yield dataConnector.execute();
             const result = yield dataConnector.transform();
             return JSON.parse(result);
         });
@@ -79,7 +82,7 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
                 }
                 const executionContext = yield this.getExecutionContext(dataConnector, vaultConfig);
                 dataConnector.setExecutionContextDataConnector(executionContext);
-                yield dataConnector.execute('');
+                yield dataConnector.execute();
                 const result = yield dataConnector.transform();
                 transformationData.push(JSON.parse(result));
             }
@@ -103,7 +106,11 @@ class DataConnectorExecution extends executionBase_js_1.ExecutionBase {
                         yield this.delay(1000);
                         response = yield (0, utils_js_1.fetchData)(parsedRequest, 0);
                     }
-                    request = yield dataConnector.execute(JSON.stringify(response));
+                    const nextRequest = yield dataConnector.execute(JSON.stringify(response));
+                    if (nextRequest === null) {
+                        throw new Error('Data connector returned null request');
+                    }
+                    request = nextRequest;
                 }
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/data-connector-loader",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "App Loader for Steer Protocol",
   "type": "module",
   "main": "lib/index.js",
@@ -76,8 +76,8 @@
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^20.5.0",
     "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/github": "^10.3.5",
-    "@semantic-release/npm": "^12.0.2",
+    "@semantic-release/github": "^12.0.6",
+    "@semantic-release/npm": "^13.1.5",
     "@semantic-release/release-notes-generator": "^14.1.0",
     "@types/jest": "29.2.4",
     "@typescript-eslint/eslint-plugin": "5.46.0",
@@ -91,7 +91,7 @@
     "husky": "^9.1.7",
     "jest": "29.3.1",
     "prettier": "2.8.1",
-    "semantic-release": "^24.2.9",
+    "semantic-release": "^25.0.3",
     "ts-jest": "29.0.3",
     "typescript": "5.0.4",
     "viem": "^2.42.1"
@@ -100,7 +100,7 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "@steerprotocol/app-loader": "^3.0.0",
+    "@steerprotocol/app-loader": "^3.0.4",
     "@steerprotocol/sdk": "^2.0.0",
     "@steerprotocol/strategy-utils": "^3.1.2",
     "axios": "^1.3.4",