@glassly/bluetooth-sdk 0.1.0-dev.31 → 0.1.0-dev.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
3
3
  /** Generated by release CI. Do not edit in a release checkout. */
4
4
  internal object GeneratedReleaseMetadata {
5
5
  const val FAMILY_BASE_VERSION: String = "0.1.0"
6
- const val RELEASE_IDENTITY: String = "0.1.0-dev.31"
7
- const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.31"
8
- const val SOURCE_COMMIT: String = "f344cf647ef3cd00444902f1154a7f5ad7a0fe52"
9
- val OTA_MANIFEST_URL: String? = null
10
- val OTA_MANIFEST_SHA256: String? = null
6
+ const val RELEASE_IDENTITY: String = "0.1.0-dev.35"
7
+ const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.35"
8
+ const val SOURCE_COMMIT: String = "6909e863991061a55c153d51bd2c4384a0f4c0a3"
9
+ const val OTA_MANIFEST_URL: String = ""
10
+ const val OTA_MANIFEST_SHA256: String = ""
11
11
  }
@@ -12,7 +12,7 @@ internal object OtaManifestDefaults {
12
12
  const val LEGACY_PROD_OTA_VERSION_URL = "https://ota.glassly.ai/prod_live_version.json"
13
13
 
14
14
  fun defaultOtaVersionUrl(): String {
15
- val manifestUrl = GeneratedReleaseMetadata.OTA_MANIFEST_URL.trim()
15
+ val manifestUrl = GeneratedReleaseMetadata.OTA_MANIFEST_URL.orEmpty().trim()
16
16
  if (manifestUrl.isBlank()) {
17
17
  throw BluetoothSdkException(
18
18
  "ota_manifest_unconfigured",
@@ -1,9 +1,9 @@
1
1
  export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
2
2
  "schemaVersion": 1,
3
3
  "familyBaseVersion": "0.1.0",
4
- "releaseIdentity": "0.1.0-dev.31",
5
- "releaseSetId": "glassly-0.1.0-dev.31",
6
- "sourceCommit": "f344cf647ef3cd00444902f1154a7f5ad7a0fe52",
4
+ "releaseIdentity": "0.1.0-dev.35",
5
+ "releaseSetId": "glassly-0.1.0-dev.35",
6
+ "sourceCommit": "6909e863991061a55c153d51bd2c4384a0f4c0a3",
7
7
  "otaManifestUrl": null,
8
8
  "otaManifestSha256": null
9
9
  });
@@ -1 +1 @@
1
- {"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n schemaVersion: 1\n familyBaseVersion: string | null\n releaseIdentity: string | null\n releaseSetId: string | null\n sourceCommit: string | null\n otaManifestUrl: string | null\n otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n \"schemaVersion\": 1,\n \"familyBaseVersion\": \"0.1.0\",\n \"releaseIdentity\": \"0.1.0-dev.31\",\n \"releaseSetId\": \"glassly-0.1.0-dev.31\",\n \"sourceCommit\": \"f344cf647ef3cd00444902f1154a7f5ad7a0fe52\",\n \"otaManifestUrl\": null,\n \"otaManifestSha256\": null\n})\n"]}
1
+ {"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n schemaVersion: 1\n familyBaseVersion: string | null\n releaseIdentity: string | null\n releaseSetId: string | null\n sourceCommit: string | null\n otaManifestUrl: string | null\n otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n \"schemaVersion\": 1,\n \"familyBaseVersion\": \"0.1.0\",\n \"releaseIdentity\": \"0.1.0-dev.35\",\n \"releaseSetId\": \"glassly-0.1.0-dev.35\",\n \"sourceCommit\": \"6909e863991061a55c153d51bd2c4384a0f4c0a3\",\n \"otaManifestUrl\": null,\n \"otaManifestSha256\": null\n})\n"]}
@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
11
11
  static let voiceActivityDetectionEnabled = false
12
12
  static let loudnessGateEnabled = true
13
13
  private static let infoSdkVersionKey = "BluetoothSdkVersion"
14
- private static let swiftPackageSdkVersion = "0.1.0-dev.31"
14
+ private static let swiftPackageSdkVersion = "0.1.0-dev.35"
15
15
  private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
16
16
 
17
17
  private static func normalizedSdkVersion(_ value: String?) -> String? {
@@ -3,9 +3,9 @@ import Foundation
3
3
  /// Generated by release CI. Do not edit in a release checkout.
4
4
  enum GeneratedReleaseMetadata {
5
5
  static let familyBaseVersion = "0.1.0"
6
- static let releaseIdentity = "0.1.0-dev.31"
7
- static let releaseSetId = "glassly-0.1.0-dev.31"
8
- static let sourceCommit = "f344cf647ef3cd00444902f1154a7f5ad7a0fe52"
9
- static let otaManifestUrl: String? = nil
10
- static let otaManifestSha256: String? = nil
6
+ static let releaseIdentity = "0.1.0-dev.35"
7
+ static let releaseSetId = "glassly-0.1.0-dev.35"
8
+ static let sourceCommit = "6909e863991061a55c153d51bd2c4384a0f4c0a3"
9
+ static let otaManifestUrl = ""
10
+ static let otaManifestSha256 = ""
11
11
  }
@@ -6,7 +6,7 @@ enum OtaManifestDefaults {
6
6
  static let legacyProdOtaVersionUrl = "https://ota.glassly.ai/prod_live_version.json"
7
7
 
8
8
  static func defaultOtaVersionUrl() throws -> String {
9
- let manifestUrl = GeneratedReleaseMetadata.otaManifestUrl.trimmingCharacters(in: .whitespacesAndNewlines)
9
+ let manifestUrl = (GeneratedReleaseMetadata.otaManifestUrl ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
10
10
  guard !manifestUrl.isEmpty else {
11
11
  throw BluetoothSdkError(
12
12
  code: "ota_manifest_unconfigured",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@glassly/bluetooth-sdk",
3
- "version": "0.1.0-dev.31",
3
+ "version": "0.1.0-dev.35",
4
4
  "description": "SDK for communicating with smart glasses",
5
5
  "main": "build/index.js",
6
6
  "react-native": "src/index.ts",
@@ -27,8 +27,9 @@ const files = [
27
27
  "android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt",
28
28
  "ios/Source/GeneratedReleaseMetadata.swift",
29
29
  ]
30
- // A release built without firmware records null OTA coordinates, so assert
31
- // those were written rather than a stale pin.
30
+ // A release built without firmware records null OTA coordinates in the JS
31
+ // metadata and empty strings in the native constants, so assert those were
32
+ // written rather than a stale pin.
32
33
  const hasOta = Boolean(otaManifestUrl) || Boolean(otaManifestSha256)
33
34
  for (const relativePath of files) {
34
35
  const contents = readFileSync(path.join(packageRoot, relativePath), "utf8")
@@ -36,8 +37,8 @@ for (const relativePath of files) {
36
37
  if (!contents.includes(otaManifestUrl)) throw new Error(`${relativePath} does not contain the OTA manifest URL`)
37
38
  if (!contents.includes(otaManifestSha256))
38
39
  throw new Error(`${relativePath} does not contain the OTA manifest SHA-256`)
39
- } else if (!/OTA_MANIFEST_URL[^\n]*(null|nil)|otaManifestUrl[^\n]*(null|nil)/i.test(contents)) {
40
- throw new Error(`${relativePath} does not record a null OTA manifest URL`)
40
+ } else if (!/OTA_MANIFEST_URL[^\n]*(null|"")|otaManifestUrl[^\n]*(null|"")/i.test(contents)) {
41
+ throw new Error(`${relativePath} does not record an absent OTA manifest URL`)
41
42
  }
42
43
  if (!contents.includes(releaseIdentity)) throw new Error(`${relativePath} does not contain the release identity`)
43
44
  }
@@ -89,10 +89,10 @@ export function renderReleaseMetadata(input) {
89
89
  ` const val RELEASE_IDENTITY: String = ${JSON.stringify(metadata.releaseIdentity)}`,
90
90
  ` const val RELEASE_SET_ID: String = ${JSON.stringify(metadata.releaseSetId)}`,
91
91
  ` const val SOURCE_COMMIT: String = ${JSON.stringify(metadata.sourceCommit)}`,
92
- // Not const: a release without a firmware pin carries null, and Kotlin
93
- // forbids a nullable const val.
94
- ` val OTA_MANIFEST_URL: String? = ${JSON.stringify(metadata.otaManifestUrl)}`,
95
- ` val OTA_MANIFEST_SHA256: String? = ${JSON.stringify(metadata.otaManifestSha256)}`,
92
+ // An absent firmware pin is written as "" OtaManifest fails closed on a
93
+ // blank URL, and the native readers dereference these without null checks.
94
+ ` const val OTA_MANIFEST_URL: String = ${JSON.stringify(metadata.otaManifestUrl ?? "")}`,
95
+ ` const val OTA_MANIFEST_SHA256: String = ${JSON.stringify(metadata.otaManifestSha256 ?? "")}`,
96
96
  "}",
97
97
  "",
98
98
  ].join("\n")
@@ -105,8 +105,8 @@ export function renderReleaseMetadata(input) {
105
105
  ` static let releaseIdentity = ${swiftString(metadata.releaseIdentity)}`,
106
106
  ` static let releaseSetId = ${swiftString(metadata.releaseSetId)}`,
107
107
  ` static let sourceCommit = ${swiftString(metadata.sourceCommit)}`,
108
- ` static let otaManifestUrl: String? = ${metadata.otaManifestUrl === null ? "nil" : swiftString(metadata.otaManifestUrl)}`,
109
- ` static let otaManifestSha256: String? = ${metadata.otaManifestSha256 === null ? "nil" : swiftString(metadata.otaManifestSha256)}`,
108
+ ` static let otaManifestUrl = ${swiftString(metadata.otaManifestUrl ?? "")}`,
109
+ ` static let otaManifestSha256 = ${swiftString(metadata.otaManifestSha256 ?? "")}`,
110
110
  "}",
111
111
  "",
112
112
  ].join("\n")
@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
12
12
  export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
13
13
  "schemaVersion": 1,
14
14
  "familyBaseVersion": "0.1.0",
15
- "releaseIdentity": "0.1.0-dev.31",
16
- "releaseSetId": "glassly-0.1.0-dev.31",
17
- "sourceCommit": "f344cf647ef3cd00444902f1154a7f5ad7a0fe52",
15
+ "releaseIdentity": "0.1.0-dev.35",
16
+ "releaseSetId": "glassly-0.1.0-dev.35",
17
+ "sourceCommit": "6909e863991061a55c153d51bd2c4384a0f4c0a3",
18
18
  "otaManifestUrl": null,
19
19
  "otaManifestSha256": null
20
20
  })