@ovok/native 1.17.0-dev.2270 → 1.17.0-dev.2274
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.
- package/lib/commonjs/modules/next/bluetooth/adapters/storage-paired-devices.js +16 -2
- package/lib/commonjs/modules/next/bluetooth/adapters/storage-paired-devices.js.map +1 -1
- package/lib/module/modules/next/bluetooth/adapters/storage-paired-devices.js +16 -2
- package/lib/module/modules/next/bluetooth/adapters/storage-paired-devices.js.map +1 -1
- package/lib/typescript/commonjs/src/modules/next/bluetooth/adapters/storage-paired-devices.d.ts.map +1 -1
- package/lib/typescript/module/src/modules/next/bluetooth/adapters/storage-paired-devices.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.storagePairedDevices = void 0;
|
|
7
|
-
|
|
7
|
+
// Only letters, digits, ".", "-" and "_": expo-secure-store refuses any other key.
|
|
8
|
+
const DEFAULT_KEY = "ovok.native.next.bluetooth.paired-devices";
|
|
9
|
+
const LEGACY_KEY = "@ovok/native/next/bluetooth/paired-devices";
|
|
8
10
|
const dateOf = value => typeof value === "string" || typeof value === "number" ? new Date(value) : null;
|
|
9
11
|
|
|
10
12
|
/** Revives the dates JSON turned into strings, and gives devices stored before the settings existed their defaults. */
|
|
@@ -36,10 +38,22 @@ const parseDevices = text => {
|
|
|
36
38
|
}
|
|
37
39
|
};
|
|
38
40
|
|
|
41
|
+
/** Devices a store that accepts the old default key (localStorage, AsyncStorage) saved there; the next write moves them. */
|
|
42
|
+
const readLegacy = async (storage, key) => {
|
|
43
|
+
if (key !== DEFAULT_KEY) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
try {
|
|
47
|
+
return await storage.getItem(LEGACY_KEY);
|
|
48
|
+
} catch {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
|
|
39
53
|
/** Paired devices as one JSON list under one key; writes run one after another so none is lost. */
|
|
40
54
|
const storagePairedDevices = (storage, key = DEFAULT_KEY) => {
|
|
41
55
|
let writes = Promise.resolve();
|
|
42
|
-
const load = async () => parseDevices(await storage.getItem(key));
|
|
56
|
+
const load = async () => parseDevices((await storage.getItem(key)) ?? (await readLegacy(storage, key)));
|
|
43
57
|
const change = update => {
|
|
44
58
|
const write = writes.then(async () => storage.setItem(key, JSON.stringify(update(await load()))));
|
|
45
59
|
writes = write.catch(() => undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DEFAULT_KEY","dateOf","value","Date","reviveDevice","raw","autoSync","keepInBackground","record","secret","pairedAt","lastConnectedAt","lastSyncedAt","lastReadingAt","battery","at","identity","parseDevices","text","parsed","JSON","parse","Array","isArray","map","
|
|
1
|
+
{"version":3,"names":["DEFAULT_KEY","LEGACY_KEY","dateOf","value","Date","reviveDevice","raw","autoSync","keepInBackground","record","secret","pairedAt","lastConnectedAt","lastSyncedAt","lastReadingAt","battery","at","identity","parseDevices","text","parsed","JSON","parse","Array","isArray","map","readLegacy","storage","key","getItem","storagePairedDevices","writes","Promise","resolve","load","change","update","write","then","setItem","stringify","catch","undefined","save","device","devices","filter","address","remove","exports"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/adapters/storage-paired-devices.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
// Only letters, digits, ".", "-" and "_": expo-secure-store refuses any other key.
|
|
4
|
+
const DEFAULT_KEY = "ovok.native.next.bluetooth.paired-devices";
|
|
5
|
+
const LEGACY_KEY = "@ovok/native/next/bluetooth/paired-devices";
|
|
4
6
|
const dateOf = value => typeof value === "string" || typeof value === "number" ? new Date(value) : null;
|
|
5
7
|
|
|
6
8
|
/** Revives the dates JSON turned into strings, and gives devices stored before the settings existed their defaults. */
|
|
@@ -32,10 +34,22 @@ const parseDevices = text => {
|
|
|
32
34
|
}
|
|
33
35
|
};
|
|
34
36
|
|
|
37
|
+
/** Devices a store that accepts the old default key (localStorage, AsyncStorage) saved there; the next write moves them. */
|
|
38
|
+
const readLegacy = async (storage, key) => {
|
|
39
|
+
if (key !== DEFAULT_KEY) {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
return await storage.getItem(LEGACY_KEY);
|
|
44
|
+
} catch {
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
|
|
35
49
|
/** Paired devices as one JSON list under one key; writes run one after another so none is lost. */
|
|
36
50
|
const storagePairedDevices = (storage, key = DEFAULT_KEY) => {
|
|
37
51
|
let writes = Promise.resolve();
|
|
38
|
-
const load = async () => parseDevices(await storage.getItem(key));
|
|
52
|
+
const load = async () => parseDevices((await storage.getItem(key)) ?? (await readLegacy(storage, key)));
|
|
39
53
|
const change = update => {
|
|
40
54
|
const write = writes.then(async () => storage.setItem(key, JSON.stringify(update(await load()))));
|
|
41
55
|
writes = write.catch(() => undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DEFAULT_KEY","dateOf","value","Date","reviveDevice","raw","autoSync","keepInBackground","record","secret","pairedAt","lastConnectedAt","lastSyncedAt","lastReadingAt","battery","at","identity","parseDevices","text","parsed","JSON","parse","Array","isArray","map","
|
|
1
|
+
{"version":3,"names":["DEFAULT_KEY","LEGACY_KEY","dateOf","value","Date","reviveDevice","raw","autoSync","keepInBackground","record","secret","pairedAt","lastConnectedAt","lastSyncedAt","lastReadingAt","battery","at","identity","parseDevices","text","parsed","JSON","parse","Array","isArray","map","readLegacy","storage","key","getItem","storagePairedDevices","writes","Promise","resolve","load","change","update","write","then","setItem","stringify","catch","undefined","save","device","devices","filter","address","remove"],"sourceRoot":"../../../../../../src","sources":["modules/next/bluetooth/adapters/storage-paired-devices.ts"],"mappings":";;AAKA;AACA,MAAMA,WAAW,GAAG,2CAA2C;AAC/D,MAAMC,UAAU,GAAG,4CAA4C;AAE/D,MAAMC,MAAM,GAAIC,KAAc,IAAmB,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAG,IAAIC,IAAI,CAACD,KAAK,CAAC,GAAG,IAAK;;AAEjI;AACA,MAAME,YAAY,GAAIC,GAAiB,KAAoB;EACzD,GAAGA,GAAG;EACNC,QAAQ,EAAED,GAAG,CAACC,QAAQ,IAAI,IAAI;EAC9BC,gBAAgB,EAAEF,GAAG,CAACE,gBAAgB,IAAI,KAAK;EAC/CC,MAAM,EAAEH,GAAG,CAACG,MAAM,IAAI,IAAI;EAC1BC,MAAM,EAAEJ,GAAG,CAACI,MAAM,IAAI,IAAI;EAC1BC,QAAQ,EAAET,MAAM,CAACI,GAAG,CAACK,QAAQ,CAAC,IAAI,IAAIP,IAAI,CAAC,CAAC,CAAC;EAC7CQ,eAAe,EAAEV,MAAM,CAACI,GAAG,CAACM,eAAe,CAAC;EAC5CC,YAAY,EAAEX,MAAM,CAACI,GAAG,CAACO,YAAY,CAAC;EACtCC,aAAa,EAAEZ,MAAM,CAACI,GAAG,CAACQ,aAAa,CAAC;EACxCC,OAAO,EAAET,GAAG,CAACS,OAAO,IAAI;IAAE,GAAGT,GAAG,CAACS,OAAO;IAAEC,EAAE,EAAEd,MAAM,CAACI,GAAG,CAACS,OAAO,CAACC,EAAE,CAAC,IAAI,IAAIZ,IAAI,CAAC,CAAC;EAAE,CAAC;EACrFa,QAAQ,EAAEX,GAAG,CAACW,QAAQ,IAAI;IAAE,GAAGX,GAAG,CAACW,QAAQ;IAAED,EAAE,EAAEd,MAAM,CAACI,GAAG,CAACW,QAAQ,CAACD,EAAE,CAAC,IAAI,IAAIZ,IAAI,CAAC,CAAC;EAAE;AAC1F,CAAC,CAAC;AAEF,MAAMc,YAAY,GAAIC,IAAmB,IAAqB;EAC5D,IAAI;IACF,MAAMC,MAAe,GAAGD,IAAI,GAAGE,IAAI,CAACC,KAAK,CAACH,IAAI,CAAC,GAAG,EAAE;IAEpD,OAAOI,KAAK,CAACC,OAAO,CAACJ,MAAM,CAAC,GAAIA,MAAM,CAAoBK,GAAG,CAACpB,YAAY,CAAC,GAAG,EAAE;EAClF,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;AACF,CAAC;;AAED;AACA,MAAMqB,UAAU,GAAG,MAAAA,CAAOC,OAAoB,EAAEC,GAAW,KAA6B;EACtF,IAAIA,GAAG,KAAK5B,WAAW,EAAE;IACvB,OAAO,IAAI;EACb;EAEA,IAAI;IACF,OAAO,MAAM2B,OAAO,CAACE,OAAO,CAAC5B,UAAU,CAAC;EAC1C,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF,CAAC;;AAED;AACA,MAAM6B,oBAAoB,GAAGA,CAACH,OAAoB,EAAEC,GAAG,GAAG5B,WAAW,KAAwB;EAC3F,IAAI+B,MAAwB,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;EAEhD,MAAMC,IAAI,GAAG,MAAAA,CAAA,KAAYhB,YAAY,CAAC,CAAC,MAAMS,OAAO,CAACE,OAAO,CAACD,GAAG,CAAC,MAAM,MAAMF,UAAU,CAACC,OAAO,EAAEC,GAAG,CAAC,CAAC,CAAC;EAEvG,MAAMO,MAAM,GAAIC,MAAmD,IAAoB;IACrF,MAAMC,KAAK,GAAGN,MAAM,CAACO,IAAI,CAAC,YAAYX,OAAO,CAACY,OAAO,CAACX,GAAG,EAAEP,IAAI,CAACmB,SAAS,CAACJ,MAAM,CAAC,MAAMF,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjGH,MAAM,GAAGM,KAAK,CAACI,KAAK,CAAC,MAAMC,SAAS,CAAC;IAErC,OAAOL,KAAK;EACd,CAAC;EAED,OAAO;IACLH,IAAI;IACJS,IAAI,EAAGC,MAAM,IAAKT,MAAM,CAAEU,OAAO,IAAK,CAAC,GAAGA,OAAO,CAACC,MAAM,CAAC,CAAC;MAAEC;IAAQ,CAAC,KAAKA,OAAO,KAAKH,MAAM,CAACG,OAAO,CAAC,EAAEH,MAAM,CAAC,CAAC;IAC/GI,MAAM,EAAGD,OAAO,IAAKZ,MAAM,CAAEU,OAAO,IAAKA,OAAO,CAACC,MAAM,CAAEF,MAAM,IAAKA,MAAM,CAACG,OAAO,KAAKA,OAAO,CAAC;EACjG,CAAC;AACH,CAAC;AAED,SAASjB,oBAAoB","ignoreList":[]}
|
package/lib/typescript/commonjs/src/modules/next/bluetooth/adapters/storage-paired-devices.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-paired-devices.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/next/bluetooth/adapters/storage-paired-devices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-paired-devices.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/next/bluetooth/adapters/storage-paired-devices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AA8ClD,mGAAmG;AACnG,QAAA,MAAM,oBAAoB,GAAI,SAAS,WAAW,EAAE,YAAiB,KAAG,iBAkBvE,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
package/lib/typescript/module/src/modules/next/bluetooth/adapters/storage-paired-devices.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-paired-devices.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/next/bluetooth/adapters/storage-paired-devices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-paired-devices.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/next/bluetooth/adapters/storage-paired-devices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AA8ClD,mGAAmG;AACnG,QAAA,MAAM,oBAAoB,GAAI,SAAS,WAAW,EAAE,YAAiB,KAAG,iBAkBvE,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|