Skip to content

Commit 405b266

Browse files
author
Marco Crespi
committed
Merge branch 'develop'
2 parents 6667a1a + 811907b commit 405b266

File tree

293 files changed

+89902
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+89902
-530
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
docs
22
lib
3+
build
34
node_modules

.github/workflows/main.yml

+21
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
publish:
3535
name: Publish package to package managers
3636
runs-on: ubuntu-latest
37+
needs:
38+
- release
3739
steps:
3840
- uses: actions/checkout@v2
3941
- uses: actions/setup-node@v1
@@ -51,3 +53,22 @@ jobs:
5153
- run: npm publish
5254
env:
5355
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
56+
57+
prebuild:
58+
name: Generates prebuilds
59+
runs-on: ${{ matrix.os }}
60+
strategy:
61+
matrix:
62+
os: [macos-latest, ubuntu-latest, windows-latest]
63+
needs:
64+
- release
65+
steps:
66+
- uses: actions/checkout@v2
67+
- uses: actions/setup-node@v1
68+
with:
69+
node-version: 14
70+
- run: npm ci
71+
- run: echo "upload=$TOKEN" > ~/.prebuildrc
72+
env:
73+
TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
- run: npm run prebuild

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ node_modules/
33

44
# Custom tests
55
tests/modum.js
6+
7+
# GYP stuff
8+
build
9+
10+
# Prebuilds
11+
prebuilds

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
docs
22
lib
3+
build
34
node_modules
45

56
README.md

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 modum.io AG
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

binding.gyp

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
'targets': [
3+
{
4+
'target_name': 'modblue-mac',
5+
'type': 'none',
6+
'conditions': [
7+
['OS=="mac"', {
8+
'dependencies': [
9+
'native/mac/binding.gyp:mac-ble',
10+
],
11+
}],
12+
],
13+
},
14+
{
15+
'target_name': 'modblue-win',
16+
'type': 'none',
17+
'conditions': [
18+
['OS=="win"', {
19+
'dependencies': [
20+
'native/win/foundation/binding.gyp:win-foundation',
21+
'native/win/storage.streams/binding.gyp:win-storage.streams',
22+
'native/win/dev.ble/binding.gyp:win-dev.ble',
23+
'native/win/dev.ble.adv/binding.gyp:win-dev.ble.adv',
24+
'native/win/dev.ble.gap/binding.gyp:win-dev.ble.gap',
25+
'native/win/dev.enum/binding.gyp:win-dev.enum',
26+
'native/win/dev.radios/binding.gyp:win-dev.radios',
27+
],
28+
}],
29+
],
30+
},
31+
],
32+
}

lib/bindings/dbus/Adapter.d.ts.map

+1-1
Original file line numberDiff line numberDiff line change

lib/bindings/dbus/Adapter.js

+11-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/dbus/Adapter.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/dbus/Peripheral.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// <reference types="node" />
12
import { AddressType, Peripheral } from '../../models';
23
import { DbusAdapter } from './Adapter';
34
import { DbusGatt } from './gatt';
@@ -12,7 +13,7 @@ export declare class DbusPeripheral extends Peripheral {
1213
private connectTimeout;
1314
private disconnecting;
1415
private disconnectTimeout;
15-
constructor(adapter: DbusAdapter, path: string, id: string, name: string, addressType: AddressType, address: string, advertisement: Record<string, unknown>, rssi: number);
16+
constructor(adapter: DbusAdapter, path: string, id: string, name: string, addressType: AddressType, address: string, advertisement: Buffer, rssi: number);
1617
private init;
1718
connect(): Promise<DbusGatt>;
1819
disconnect(): Promise<void>;

lib/bindings/dbus/Peripheral.d.ts.map

+1-1
Original file line numberDiff line numberDiff line change

0 commit comments

Comments
 (0)