@steerprotocol/app-loader 1.0.0 → 1.0.1

package/lib/WasmModule.d.ts

@@ -1,12 +1,13 @@
 declare function responseHandler(body: ArrayBuffer, statusCode: number, redirected: number, callbackID: number): void;
 declare function initialize(config: string): void;
 declare function config(): string;
-declare function version(): string;
+declare function version(): number;
 declare function transform(): string;
 declare function execute(...params: number[] | string[] | ArrayBuffer[] | null[]): string;
 declare function __new(size: number, id: number): number;
 declare function __pin(ptr: number): number;
 declare function __unpin(ptr: number): number;
+declare function reset(): void;
 export type WasmModule = {
     responseHandler: typeof responseHandler;
     initialize: typeof initialize;
@@ -18,5 +19,6 @@ export type WasmModule = {
     __new: typeof __new;
     __pin: typeof __pin;
     __unpin: typeof __unpin;
+    reset: typeof reset;
 };
 export {};

package/lib/index.d.ts

@@ -9,4 +9,10 @@ export { Candle, RawTradeData, WasmModule };
  * @returns
  */
 export declare function loadWasmSync(input: ArrayBuffer, imports?: {}): WasmModule;
+/**
+ * Load a wasm bundle asynchronously. Accepts the actual binary data or file path.
+ * @param input - Wasm bundle data or path
+ * @param imports - Imports
+ * @returns
+ */
 export declare function loadWasm(input: string | ArrayBuffer, imports?: {}): Promise<WasmModule>;

package/lib/index.js

@@ -44,10 +44,6 @@ const RawTradeData_1 = require("./RawTradeData");
 Object.defineProperty(exports, "RawTradeData", { enumerable: true, get: function () { return RawTradeData_1.RawTradeData; } });
 const ARRAYBUFFER_ID = 1;
 const STRING_ID = 2;
-// Pointers (for asyncify)
-let _fetchGETSyncPtr = 0;
-let _fetchPOSTSyncPtr = 0;
-let _ohlcvPtr = 0;
 // Globals
 let WASM_MEMORY;
 let WASM_EXPORTS;
@@ -56,6 +52,15 @@ let WASM_DV;
 let ASYNCIFY_PTR = 0;
 let ASYNCIFY_MEM;
 let ASYNCIFY_INITIALIZED = false;
+let fetchFn = null;
+let ccxtFn = null;
+var State;
+(function (State) {
+    State[State["None"] = 0] = "None";
+    State[State["Unwinding"] = 1] = "Unwinding";
+    State[State["Rewinding"] = 2] = "Rewinding";
+})(State || (State = {}));
+let detachedValue = null;
 /**
  * Load a wasm bundle synchronously. Only accepts the actual binary data.
  * @param input - Wasm bundle data
@@ -66,6 +71,12 @@ function loadWasmSync(input, imports = {}) {
     return instantiate(new WebAssembly.Module(input), imports);
 }
 exports.loadWasmSync = loadWasmSync;
+/**
+ * Load a wasm bundle asynchronously. Accepts the actual binary data or file path.
+ * @param input - Wasm bundle data or path
+ * @param imports - Imports
+ * @returns
+ */
 function loadWasm(input, imports = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const mod = instantiate(yield (() => __awaiter(this, void 0, void 0, function* () {
@@ -107,7 +118,6 @@ function instantiate(module, imports = {}) {
                     return;
                 ASYNCIFY_PTR = frame_ptr;
                 ASYNCIFY_MEM[ASYNCIFY_PTR >> 2] = ASYNCIFY_PTR + 8;
-                // I don't know if I need to reserve all this memory...
                 ASYNCIFY_MEM[(ASYNCIFY_PTR + 4) >> 2] = stack_ptr;
                 ASYNCIFY_INITIALIZED = true;
             },
@@ -121,47 +131,33 @@ function instantiate(module, imports = {}) {
                 console.log(__liftString(text));
             },
             ccxt_fetchOHLCV: (exchangeId, symbol, timeframe, limit, since) => {
-                // Since may need to be passed as 64-bit?
-                // Timestamps are large
                 // @ts-ignore
                 const currentState = WASM_EXPORTS.asyncify_get_state();
-                if (currentState === 2) {
-                    //console.log("asyncify_stop_rewind() [resume wasm]");
+                if (currentState === State.Rewinding) {
                     // @ts-ignore
                     WASM_EXPORTS.asyncify_stop_rewind();
-                    return _ohlcvPtr;
-                }
-                else if (currentState === 0) {
-                    //console.log("asyncify_start_unwind() [pause wasm]");
                     // @ts-ignore
-                    WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
-                    // How about we pass an Enum back and forth?
-                    const _exchange = __liftString(exchangeId);
-                    const _symbol = __liftString(symbol);
-                    const _timeframe = __liftString(timeframe);
+                    const ptr = __lowerStaticArray((pointer, value) => {
+                        __setU32(pointer, __lowerStaticArray(__setF64, 7, 3, value, Float64Array));
+                    }, 8, 2, detachedValue);
+                    return ptr;
+                }
+                const _exchange = __liftString(exchangeId);
+                const _symbol = __liftString(symbol);
+                const _timeframe = __liftString(timeframe);
+                ccxtFn = (() => __awaiter(this, void 0, void 0, function* () {
                     if (!_exchange || !_symbol || !_timeframe)
                         throw new Error('Exchange, Symbol, or Timeframe not provided when fetching OHCLV data.');
                     // @ts-ignore
-                    new ccxt_1.default[_exchange]({
+                    const data = yield new ccxt_1.default[_exchange]({
                         apiKey: '',
                         secret: '',
-                    })
-                        .fetchOHLCV(_symbol, _timeframe, since, limit)
-                        .then((data) => {
-                        //console.log("asyncify_stop_unwind() [unpause wasm]");
-                        // @ts-ignore
-                        WASM_EXPORTS.asyncify_stop_unwind();
-                        // @ts-ignore: __new is defined
-                        _ohlcvPtr = __lowerStaticArray((pointer, value) => {
-                            __setU32(pointer, __lowerStaticArray(__setF64, 7, 3, value, Float64Array));
-                        }, 8, 2, data);
-                        //console.log("asyncify_start_rewind() [resuming wasm]");
-                        // @ts-ignore
-                        WASM_EXPORTS.asyncify_start_rewind(ASYNCIFY_PTR);
-                        WASM_EXPORTS.execute();
-                    });
-                }
-            },
+                    }).fetchOHLCV(_symbol, _timeframe, since, limit);
+                    return data;
+                }));
+                // @ts-ignore
+                WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
+            }
         },
         'as-fetch': {
             _initAsyncify(frame_ptr, stack_ptr) {
@@ -177,77 +173,49 @@ function instantiate(module, imports = {}) {
                 ASYNCIFY_INITIALIZED = true;
             },
             _fetchPOSTSync(url, mode, headers, body) {
-                var _a;
                 // @ts-ignore
                 const currentState = WASM_EXPORTS.asyncify_get_state();
-                if (currentState === 2) {
-                    //console.log("asyncify_stop_rewind() [resume wasm]");
+                if (currentState === State.Rewinding) {
                     // @ts-ignore
                     WASM_EXPORTS.asyncify_stop_rewind();
-                    const ptr = _fetchPOSTSyncPtr;
-                    _fetchPOSTSyncPtr = 0;
+                    const ptr = __lowerBuffer(detachedValue);
+                    detachedValue = null;
                     return ptr;
                 }
-                else if (currentState === 0) {
-                    //console.log("asyncify_start_unwind() [pause wasm]");
-                    // @ts-ignore
-                    WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
-                    fetch((_a = __liftString(url)) !== null && _a !== void 0 ? _a : '', {
+                fetchFn = (() => __awaiter(this, void 0, void 0, function* () {
+                    const res = yield fetch(__liftString(url) || '', {
                         method: 'POST',
                         mode: modeToString(mode) || 'cors',
                         headers: __liftArray((pointer) => __liftArray((pointer) => __liftString(__getU32(pointer)), 2, __getU32(pointer)), 2, headers) || [],
-                        body: __liftBuffer(body),
-                    }).then((res) => __awaiter(this, void 0, void 0, function* () {
-                        const value = yield res.arrayBuffer();
-                        //console.log("asyncify_stop_unwind() [unpause wasm]");
-                        // @ts-ignore
-                        WASM_EXPORTS.asyncify_stop_unwind();
-                        // @ts-ignore
-                        _fetchPOSTSyncPtr = __lowerBuffer(value);
-                        //wasm_exports.__new(value.byteLength, 1);
-                        //new Uint8Array(wasm_exports.memory.buffer).set(new Uint8Array(value), _fetchPOSTSyncPtr);
-                        //console.log("asyncify_start_rewind() [resuming wasm]");
-                        // @ts-ignore
-                        WASM_EXPORTS.asyncify_start_rewind(ASYNCIFY_PTR);
-                        // @ts-ignore
-                        // Set to your execute function that your fetch calls are in. I would go and create a _start func
-                        WASM_EXPORTS.execute();
-                    }));
-                }
+                        body: __liftBuffer(body)
+                    });
+                    const value = yield res.arrayBuffer();
+                    return value;
+                }));
+                // @ts-ignore
+                WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
             },
             _fetchGETSync(url, mode, headers) {
                 // @ts-ignore
                 const currentState = WASM_EXPORTS.asyncify_get_state();
-                if (currentState === 2) {
+                if (currentState === State.Rewinding) {
                     // @ts-ignore
-                    //console.log("asyncify_stop_rewind() [resume wasm]");
                     WASM_EXPORTS.asyncify_stop_rewind();
-                    const ptr = _fetchGETSyncPtr;
-                    _fetchGETSyncPtr = 0;
+                    const ptr = __lowerBuffer(detachedValue);
+                    detachedValue = null;
                     return ptr;
                 }
-                else if (currentState === 0) {
-                    // @ts-ignore
-                    //console.log("asyncify_start_unwind() [pause wasm]");
-                    WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
-                    fetch(__liftString(url) || '', {
+                fetchFn = (() => __awaiter(this, void 0, void 0, function* () {
+                    const res = yield fetch(__liftString(url) || '', {
                         method: 'GET',
                         mode: modeToString(mode) || 'cors',
                         headers: __liftArray((pointer) => __liftArray((pointer) => __liftString(__getU32(pointer)), 2, __getU32(pointer)), 2, headers) || [],
-                    }).then((res) => __awaiter(this, void 0, void 0, function* () {
-                        const value = yield res.arrayBuffer();
-                        // @ts-ignore
-                        //console.log("asyncify_stop_unwind() [unpause wasm]");
-                        WASM_EXPORTS.asyncify_stop_unwind();
-                        // @ts-ignore
-                        _fetchGETSyncPtr = __lowerBuffer(value);
-                        // @ts-ignore
-                        //console.log("asyncify_start_rewind() [resuming wasm]");
-                        WASM_EXPORTS.asyncify_start_rewind(ASYNCIFY_PTR);
-                        // @ts-ignore
-                        WASM_EXPORTS.execute();
-                    }));
-                }
+                    });
+                    const value = yield res.arrayBuffer();
+                    return value;
+                }));
+                // @ts-ignore
+                WASM_EXPORTS.asyncify_start_unwind(ASYNCIFY_PTR);
             },
             _fetchGET(url, mode, headers, callbackID) {
                 fetch(__liftString(url) || '', {
@@ -289,23 +257,61 @@ function instantiate(module, imports = {}) {
             }
         },
         initialize(config) {
-            // @ts-ignore
-            WASM_EXPORTS.initialize(__lowerString(config));
-        },
-        execute(...params) {
-            const loweredArgs = new Array(params.length);
-            for (let i = 0; i < params.length; i++) {
-                loweredArgs[i] = __lowerRetained(params[i]);
+            try {
+                // @ts-ignore
+                WASM_EXPORTS.initialize(__lowerStringRetained(config));
             }
-            for (let i = 0; i < loweredArgs.length; i++) {
-                if (typeof params[i] !== 'number')
-                    __release(loweredArgs[i]);
+            catch (e) {
+                console.error(e);
+                throw new Error('Unable to call .initialize on wasm module. Are you sure this is a data connector?');
             }
-            // @ts-ignore
-            return __liftString(WASM_EXPORTS.execute(...loweredArgs));
+        },
+        execute(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const loweredArgs = new Array(params.length);
+                    for (let i = 0; i < params.length; i++) {
+                        loweredArgs[i] = __lowerRetained(params[i]);
+                    }
+                    /*for (let i = 0; i < loweredArgs.length; i++) {
+                      if (typeof params[i] !== 'number') __release(loweredArgs[i]);
+                    }*/
+                    let result = WASM_EXPORTS.execute(...loweredArgs);
+                    if (ASYNCIFY_INITIALIZED) {
+                        // @ts-ignore
+                        while (WASM_EXPORTS.asyncify_get_state() === State.Unwinding) {
+                            // @ts-ignore
+                            WASM_EXPORTS.asyncify_stop_unwind();
+                            if (fetchFn)
+                                detachedValue = yield fetchFn();
+                            if (ccxtFn)
+                                detachedValue = yield ccxtFn();
+                            // @ts-ignore
+                            WASM_EXPORTS.asyncify_start_rewind(ASYNCIFY_PTR);
+                            result = WASM_EXPORTS.execute();
+                        }
+                    }
+                    if (fetchFn)
+                        fetchFn = null;
+                    if (ccxtFn)
+                        ccxtFn = null;
+                    // @ts-ignore
+                    return result ? __liftString(result) : null;
+                }
+                catch (e) {
+                    console.error(e);
+                    throw new Error('Unable to call .execute on wasm module. Are you sure this is a data connector?');
+                }
+            });
         },
         config() {
-            return __liftString(WASM_EXPORTS.config());
+            try {
+                return __liftString(WASM_EXPORTS.config());
+            }
+            catch (e) {
+                console.error(e);
+                throw new Error('Unable to call .config on wasm module. Are you sure this is a data connector?');
+            }
         },
         transform() {
             try {
@@ -316,6 +322,14 @@ function instantiate(module, imports = {}) {
                 throw new Error('Unable to call .transform on wasm module. Are you sure this is a data connector?');
             }
         },
+        reset() {
+            try {
+                WASM_EXPORTS.reset();
+            }
+            catch (e) {
+                console.log(e);
+            }
+        }
     }, WASM_EXPORTS);
     WASM_DV = new DataView(WASM_MEMORY.buffer);
     return handledExports;
@@ -331,6 +345,7 @@ function __retain(ptr) {
     }
     return ptr;
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 function __release(ptr) {
     if (ptr) {
         const refcount = refcounts.get(ptr);
@@ -391,6 +406,7 @@ function __lowerStringRetained(str) {
         memoryU16[(ptr >>> 1) + i] = str.charCodeAt(i);
     return ptr;
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function __liftArray(liftElement, align, ptr) {
     if (!ptr)
         return null;
@@ -408,6 +424,7 @@ function __liftArray(liftElement, align, ptr) {
         values[i] = liftElement(dataStart + ((i << align) >>> 0));
     return values;
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 function __lowerArray(lowerElement, id, align, values) {
     if (values == null)
         return 0;
@@ -445,6 +462,7 @@ function __lowerBufferRetained(buf) {
     new Uint8Array(WASM_MEMORY.buffer).set(new Uint8Array(buf), ptr);
     return ptr;
 }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function __lowerStaticArray(lowerElement, id, align, values, typedConstructor) {
     if (values == null)
         return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/app-loader",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",