Fixed parsing in get_candle with context for Pocket Option API changes #23
+641
−632
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| name: JS Package Publish | ||
| env: | ||
| DEBUG: napi:* | ||
| APP_NAME: 'binary-options-tools' | ||
| MACOSX_DEPLOYMENT_TARGET: '10.13' | ||
| permissions: | ||
| contents: write | ||
|
|
@@ -10,6 +10,7 @@ permissions: | |
| push: | ||
| branches: | ||
| - main | ||
| - master | ||
| tags-ignore: | ||
| - '**' | ||
| paths-ignore: | ||
|
|
@@ -18,15 +19,14 @@ permissions: | |
| - '**/*.gitignore' | ||
| - .editorconfig | ||
| - docs/** | ||
| workflow_dispatch: | ||
| jobs: | ||
| build: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| settings: | ||
| - host: macos-13 # (intel processor) | ||
| target: x86_64-apple-darwin | ||
| build: yarn build --target x86_64-apple-darwin | ||
| - host: windows-latest | ||
|
|
@@ -37,37 +37,37 @@ jobs: | |
| yarn build --target i686-pc-windows-msvc | ||
| yarn test | ||
| target: i686-pc-windows-msvc | ||
| - host: ubuntu-22.04 | ||
| target: x86_64-unknown-linux-gnu | ||
| docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian | ||
| build: yarn build --target x86_64-unknown-linux-gnu | ||
| - host: ubuntu-22.04 | ||
| target: x86_64-unknown-linux-musl | ||
| docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine | ||
| build: yarn build --target x86_64-unknown-linux-musl | ||
| - host: macos-15 # (arm64 processor, Apple Silicon) | ||
| target: aarch64-apple-darwin | ||
| build: yarn build --target aarch64-apple-darwin | ||
| - host: ubuntu-22.04 | ||
| target: aarch64-unknown-linux-gnu | ||
| docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 | ||
| build: yarn build --target aarch64-unknown-linux-gnu | ||
| - host: ubuntu-22.04 | ||
| target: armv7-unknown-linux-gnueabihf | ||
| setup: | | ||
| sudo apt-get update | ||
| sudo apt-get install gcc-arm-linux-gnueabihf -y | ||
| build: yarn build --target armv7-unknown-linux-gnueabihf | ||
| - host: ubuntu-22.04 | ||
| target: armv7-unknown-linux-musleabihf | ||
| build: yarn build --target armv7-unknown-linux-musleabihf | ||
| - host: ubuntu-22.04 | ||
| target: aarch64-linux-android | ||
| build: yarn build --target aarch64-linux-android | ||
| - host: ubuntu-22.04 | ||
| target: armv7-linux-androideabi | ||
| build: yarn build --target armv7-linux-androideabi | ||
| - host: ubuntu-22.04 | ||
| target: aarch64-unknown-linux-musl | ||
| docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine | ||
| build: |- | ||
|
|
@@ -77,7 +77,7 @@ jobs: | |
| - host: windows-latest | ||
| target: aarch64-pc-windows-msvc | ||
| build: yarn build --target aarch64-pc-windows-msvc | ||
| - host: ubuntu-22.04 | ||
| target: riscv64gc-unknown-linux-gnu | ||
| setup: | | ||
| sudo apt-get update | ||
|
|
@@ -140,7 +140,13 @@ jobs: | |
| if: ${{ matrix.settings.docker }} | ||
| with: | ||
| image: ${{ matrix.settings.docker }} | ||
| options: > | ||
| --user 0:0 | ||
| -v ${{ github.workspace }}/BinaryOptionsToolsJs/.cargo-cache/git/db:/usr/local/cargo/git/db | ||
| -v ${{ github.workspace }}/BinaryOptionsToolsJs/.cargo/registry/cache:/usr/local/cargo/registry/cache | ||
| -v ${{ github.workspace }}/BinaryOptionsToolsJs/.cargo/registry/index:/usr/local/cargo/registry/index | ||
| -v ${{ github.workspace }}:/build | ||
| -w /build/BinaryOptionsToolsJs | ||
| run: ${{ matrix.settings.build }} | ||
| - name: Build | ||
| run: ${{ matrix.settings.build }} | ||
|
|
@@ -211,7 +217,7 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| settings: | ||
| - host: macos-13 | ||
| target: x86_64-apple-darwin | ||
| - host: windows-latest | ||
| target: x86_64-pc-windows-msvc | ||
|
|
@@ -420,7 +426,7 @@ jobs: | |
| name: Build universal macOS binary | ||
| needs: | ||
| - build | ||
| runs-on: macos-15 # (arm64 processor, Apple Silicon) | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Setup node | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,7 @@ | |
| /rust/target | ||
| /examples/*.log | ||
| .qodo | ||
| /target | ||
| */errors.log | ||
| node_modules | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ chrono = "0.4.41" | |
| regex = "1.11.1" | ||
| tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } | ||
| once_cell = "1.21.3" | ||
| openssl = { version = "0.10", features = ["vendored"] } | ||
|
|
||
| [build-dependencies] | ||
| napi-build = "2.1.6" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -280,6 +280,26 @@ export declare class PocketOption { | |
| * ``` | ||
| */ | ||
| getCandles(asset: string, period: number, offset: number): Promise<any> | ||
| /** | ||
| * Retrieves historical candle data for an asset with time | ||
| * | ||
| * # Arguments | ||
| * * `asset` - The trading asset/symbol (e.g., "EUR/USD") | ||
| * * `time` - The UNIX timestamp for the start of the candle data | ||
| * * `period` - The candle period in seconds | ||
| * * `offset` - Time offset for historical data | ||
| * | ||
| * # Returns | ||
| * A JSON string containing the candle data | ||
| * | ||
| * # Examples | ||
| * ```javascript | ||
| * const candles = await client.getCandlesAdvanced("EUR/USD", 1751925016, 60, 6000); | ||
| * const data = JSON.parse(candles); | ||
| * console.log(`Retrieved ${data.length} candles`); | ||
| * ``` | ||
| */ | ||
| getCandlesAdvanced(asset: string, time: number, period: number, offset: number): Promise<any> | ||
| /** | ||
| * Retrieves the current account balance. | ||
| * | ||
|
|
@@ -558,6 +578,8 @@ export declare class PocketOption { | |
| * ``` | ||
| */ | ||
| createRawIterator(message: string, validator: Validator, timeout?: number | undefined | null): Promise<RawStreamIterator> | ||
| /** Returns the current server time as a UNIX timestamp */ | ||
| getServerTime(): Promise<number> | ||
| } | ||
| /** | ||
| * A validator for WebSocket messages that provides various matching strategies. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -278,6 +278,33 @@ impl PocketOption { | |
| serde_json::to_value(&res).map_err(|e| Error::from_reason(e.to_string())) | ||
| } | ||
|
|
||
| /// Retrieves historical candle data for an asset with time | ||
| /// | ||
| /// # Arguments | ||
| /// * `asset` - The trading asset/symbol (e.g., "EUR/USD") | ||
| /// * `time` - The UNIX timestamp for the start of the candle data | ||
| /// * `period` - The candle period in seconds | ||
| /// * `offset` - Time offset for historical data | ||
| /// | ||
| /// # Returns | ||
| /// A JSON string containing the candle data | ||
| /// | ||
| /// # Examples | ||
| /// ```javascript | ||
| /// const candles = await client.getCandlesAdvanced("EUR/USD", 1751925016, 60, 6000); | ||
| /// const data = JSON.parse(candles); | ||
| /// console.log(`Retrieved ${data.length} candles`); | ||
| /// ``` | ||
| #[napi] | ||
| pub async fn get_candles_advanced(&self, asset: String, time: i64, period: i64, offset: i64) -> Result<Value> { | ||
| let res = self | ||
| .client | ||
| .get_candles_advanced(asset, time, period, offset) | ||
| .await | ||
| .map_err(|e| Error::from_reason(e.to_string()))?; | ||
| serde_json::to_value(&res).map_err(|e| Error::from_reason(e.to_string())) | ||
| } | ||
|
|
||
| /// Retrieves the current account balance. | ||
| /// | ||
| /// # Returns | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ edition = "2021" | |
| description = "A library to connect to PocketOption using python with async and sync support." | ||
| license = "BSD License (BSD)" | ||
| homepage = "https://github.com/ChipaDevTeam/BinaryOptionsTools-v2" | ||
| readme = "README.md" | ||
|
|
||
| # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html | ||
| [lib] | ||
|
|
@@ -29,3 +29,4 @@ tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } | |
| chrono = "0.4.41" | ||
| url = "2.5.4" | ||
| regex = "1.11.1" | ||
| openssl = { version = "0.10", features = ["vendored"] } | ||
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
musllinux job: armv7 lacks cross-compile setup
Unlike the glibc job, the musllinux armv7 leg has no steps to install the Rust target, tool-chain or linker env vars, so it will fail at compile/link time. Mirror the fixes from the Linux job.
🤖 Prompt for AI Agents