@fireproof/core 0.21.0-dev-preview-5 → 0.21.0-dev-preview-6
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/blockstore/attachable-store.d.ts.map +1 -1
- package/blockstore/attachable-store.js +5 -4
- package/blockstore/attachable-store.js.map +1 -1
- package/blockstore/loader.d.ts +1 -2
- package/blockstore/loader.d.ts.map +1 -1
- package/blockstore/loader.js +10 -40
- package/blockstore/loader.js.map +1 -1
- package/blockstore/store.js +1 -1
- package/blockstore/store.js.map +1 -1
- package/blockstore/types.d.ts +2 -0
- package/blockstore/types.d.ts.map +1 -1
- package/blockstore/types.js.map +1 -1
- package/database.d.ts +1 -0
- package/database.d.ts.map +1 -1
- package/database.js +1 -0
- package/database.js.map +1 -1
- package/ledger.d.ts +2 -3
- package/ledger.d.ts.map +1 -1
- package/ledger.js +19 -16
- package/ledger.js.map +1 -1
- package/package.json +1 -1
- package/protocols/cloud/http-connection.d.ts +1 -2
- package/protocols/cloud/http-connection.d.ts.map +1 -1
- package/protocols/cloud/http-connection.js +0 -1
- package/protocols/cloud/http-connection.js.map +1 -1
- package/protocols/cloud/msg-types-data.d.ts +4 -4
- package/protocols/cloud/msg-types-data.d.ts.map +1 -1
- package/protocols/cloud/msg-types-data.js.map +1 -1
- package/protocols/cloud/msg-types-meta.d.ts +13 -13
- package/protocols/cloud/msg-types-meta.d.ts.map +1 -1
- package/protocols/cloud/msg-types-meta.js.map +1 -1
- package/protocols/cloud/msg-types-wal.d.ts +4 -4
- package/protocols/cloud/msg-types-wal.d.ts.map +1 -1
- package/protocols/cloud/msg-types-wal.js.map +1 -1
- package/protocols/cloud/msg-types.d.ts +19 -33
- package/protocols/cloud/msg-types.d.ts.map +1 -1
- package/protocols/cloud/msg-types.js +1 -4
- package/protocols/cloud/msg-types.js.map +1 -1
- package/protocols/cloud/msger.d.ts +38 -47
- package/protocols/cloud/msger.d.ts.map +1 -1
- package/protocols/cloud/msger.js +106 -211
- package/protocols/cloud/msger.js.map +1 -1
- package/protocols/cloud/ws-connection.d.ts +3 -14
- package/protocols/cloud/ws-connection.d.ts.map +1 -1
- package/protocols/cloud/ws-connection.js +34 -73
- package/protocols/cloud/ws-connection.js.map +1 -1
- package/protocols/index.d.ts +0 -1
- package/protocols/index.d.ts.map +1 -1
- package/protocols/index.js +0 -1
- package/protocols/index.js.map +1 -1
- package/react/types.d.ts +8 -28
- package/react/types.d.ts.map +1 -1
- package/react/use-attach.d.ts +4 -9
- package/react/use-attach.d.ts.map +1 -1
- package/react/use-attach.js +43 -136
- package/react/use-attach.js.map +1 -1
- package/react/use-fireproof.js +2 -2
- package/react/use-fireproof.js.map +1 -1
- package/runtime/gateways/cloud/gateway.d.ts +8 -8
- package/runtime/gateways/cloud/gateway.d.ts.map +1 -1
- package/runtime/gateways/cloud/gateway.js +15 -17
- package/runtime/gateways/cloud/gateway.js.map +1 -1
- package/runtime/gateways/cloud/to-cloud.d.ts +9 -22
- package/runtime/gateways/cloud/to-cloud.d.ts.map +1 -1
- package/runtime/gateways/cloud/to-cloud.js +59 -75
- package/runtime/gateways/cloud/to-cloud.js.map +1 -1
- package/runtime/gateways/file/key-bag-file.d.ts +0 -1
- package/runtime/gateways/file/key-bag-file.d.ts.map +1 -1
- package/runtime/gateways/file/key-bag-file.js +0 -12
- package/runtime/gateways/file/key-bag-file.js.map +1 -1
- package/runtime/gateways/indexeddb/gateway-impl.d.ts.map +1 -1
- package/runtime/gateways/indexeddb/gateway-impl.js.map +1 -1
- package/runtime/gateways/indexeddb/key-bag-indexeddb.d.ts +0 -1
- package/runtime/gateways/indexeddb/key-bag-indexeddb.d.ts.map +1 -1
- package/runtime/gateways/indexeddb/key-bag-indexeddb.js +0 -6
- package/runtime/gateways/indexeddb/key-bag-indexeddb.js.map +1 -1
- package/runtime/key-bag-memory.d.ts +0 -1
- package/runtime/key-bag-memory.d.ts.map +1 -1
- package/runtime/key-bag-memory.js +0 -7
- package/runtime/key-bag-memory.js.map +1 -1
- package/runtime/key-bag.d.ts +0 -3
- package/runtime/key-bag.d.ts.map +1 -1
- package/runtime/key-bag.js +0 -6
- package/runtime/key-bag.js.map +1 -1
- package/runtime/keyed-crypto.d.ts.map +1 -1
- package/runtime/keyed-crypto.js +5 -5
- package/runtime/keyed-crypto.js.map +1 -1
- package/tests/blockstore/keyed-crypto.test.ts +150 -0
- package/tests/fireproof/attachable.test.ts +1 -1
- package/tests/utils.test.ts +192 -0
- package/types.d.ts +2 -1
- package/types.d.ts.map +1 -1
- package/use-fireproof/iframe-strategy.d.ts +4 -6
- package/use-fireproof/iframe-strategy.d.ts.map +1 -1
- package/use-fireproof/iframe-strategy.js +11 -7
- package/use-fireproof/iframe-strategy.js.map +1 -1
- package/use-fireproof/index.d.ts +2 -6
- package/use-fireproof/index.d.ts.map +1 -1
- package/use-fireproof/index.js +3 -23
- package/use-fireproof/index.js.map +1 -1
- package/use-fireproof/redirect-strategy.d.ts +4 -11
- package/use-fireproof/redirect-strategy.d.ts.map +1 -1
- package/use-fireproof/redirect-strategy.js +20 -142
- package/use-fireproof/redirect-strategy.js.map +1 -1
- package/utils.d.ts +6 -5
- package/utils.d.ts.map +1 -1
- package/utils.js +67 -19
- package/utils.js.map +1 -1
- package/protocols/dashboard/index.d.ts +0 -4
- package/protocols/dashboard/index.d.ts.map +0 -1
- package/protocols/dashboard/index.js +0 -4
- package/protocols/dashboard/index.js.map +0 -1
- package/protocols/dashboard/msg-api.d.ts +0 -11
- package/protocols/dashboard/msg-api.d.ts.map +0 -1
- package/protocols/dashboard/msg-api.js +0 -55
- package/protocols/dashboard/msg-api.js.map +0 -1
- package/protocols/dashboard/msg-is.d.ts +0 -45
- package/protocols/dashboard/msg-is.d.ts.map +0 -1
- package/protocols/dashboard/msg-is.js +0 -63
- package/protocols/dashboard/msg-is.js.map +0 -1
- package/protocols/dashboard/msg-types.d.ts +0 -397
- package/protocols/dashboard/msg-types.d.ts.map +0 -1
- package/protocols/dashboard/msg-types.js +0 -4
- package/protocols/dashboard/msg-types.js.map +0 -1
- package/tests/protocols/cloud/msger.test.ts +0 -563
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ws-connection.js","sourceRoot":"","sources":["../../../../../src/protocols/cloud/ws-connection.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAU,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAW,UAAU,EAAE,aAAa,EAAkD,MAAM,gBAAgB,CAAC;
|
1
|
+
{"version":3,"file":"ws-connection.js","sourceRoot":"","sources":["../../../../../src/protocols/cloud/ws-connection.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAU,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAW,UAAU,EAAE,aAAa,EAAkD,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE9H,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAO9C,MAAM,OAAO,YAAa,SAAQ,oBAAoB;IAepD,YAAY,KAAgB,EAAE,EAAa,EAAE,IAAyB,EAAE,SAA2B;QACjG,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAVjB,8BAAS,IAAI,GAAG,EAAmB,EAAC;QACpC,gCAAW,IAAI,GAAG,EAAiB,EAAC;QAEpC,eAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;QAEpD,WAAM,GAAG,KAAK,CAAC;QA4DN,oCAAe,KAAK,EAAE,KAAmB,EAAE,EAAE;YACpD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,KAAK,IAAI,EAAE;gBAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAY,CAAC;gBAC1E,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACpE,OAAO;YACT,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;YAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2BAAO,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAE9C,EAAE,CAAC,GAAG,CAAC,CAAC;YACV,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC;qBAAM,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBAEhC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBAEN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC,EAAC;QAiCO,gBAAW,GAAG,IAAI,GAAG,EAA0C,CAAC;QArHvE,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IAEf,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,YAAY,GAA4B,IAAI,MAAM,EAAmB,CAAC;QAC5E,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3F,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAa,EAAE,GAAG,CAAC,CAAC,CAAC;YACpD,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;YACpB,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC;QACF,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YACpE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC,CAAC;QACF,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAa,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACtH,CAAC;YACD,uBAAA,IAAI,iCAAa,MAAjB,IAAI,EAAc,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC;QACF,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YAEpB,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;gBACvE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAa,EAAE,GAAG,CAAC,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACxD,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAMD,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAkCD,KAAK,CAAC,KAAK;QACT,uBAAA,IAAI,6BAAS,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,uBAAA,IAAI,6BAAS,CAAC,KAAK,EAAE,CAAC;QACtB,uBAAA,IAAI,2BAAO,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAoB,GAAoB;QAC3C,uBAAA,IAAI,2BAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,CAAuC,GAAM;QAE/C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAmB,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAoB,EAAc;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;QACpC,uBAAA,IAAI,2BAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAa,CAAC,CAAC;QACpC,OAAO,GAAG,EAAE,CAAC,uBAAA,IAAI,2BAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,CAAC,EAAS;QACf,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;QACpC,uBAAA,IAAI,6BAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,OAAO,GAAG,EAAE,CAAC,uBAAA,IAAI,6BAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,CAAuC,GAAM,EAAE,IAAiB;QAClE,MAAM,KAAK,GAAuB;YAChC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG;YAC3B,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG;gBACR,IAAI;aACL;SAG2B,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,IAAI,cAAc,CAAkB;YACzC,MAAM,EAAE,GAAG,EAAE;gBAEX,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpC,CAAC;YACD,KAAK,EAAE,CAAC,UAAU,EAAE,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAI,CAAC,GAAG,EAAE,EAAE;oBACpB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBACxB,OAAO;oBACT,CAAC;oBACD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC5B,OAAO;oBACT,CAAC;oBACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;wBACtC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,MAAM,GAAG,IAAI,MAAM,EAAK,CAAC;gBAC/B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrG,MAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC9B,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBAEpB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBACxB,UAAU,CAAC,KAAK,EAAE,CAAC;oBACrB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAuC,GAAM,EAAE,IAAiB;QAC3E,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,MAAM,EAAK,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACrG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;CAMF"}
|
package/protocols/index.d.ts
CHANGED
package/protocols/index.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/protocols/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/protocols/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
|
package/protocols/index.js
CHANGED
package/protocols/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/protocols/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/protocols/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
|
package/react/types.d.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
|
-
import type { AllDocsQueryOpts, Attached, ChangesOptions, ClockHead, ConfigOpts, Database, DocFragment, DocResponse, DocSet, DocTypes, DocWithId, IndexKeyType, IndexRow, MapFn, QueryOpts
|
2
|
-
import { TokenAndClaims } from "../runtime/gateways/cloud/to-cloud.js";
|
1
|
+
import type { AllDocsQueryOpts, Attachable, Attached, ChangesOptions, ClockHead, ConfigOpts, Database, DocFragment, DocResponse, DocSet, DocTypes, DocWithId, IndexKeyType, IndexRow, MapFn, QueryOpts } from "@fireproof/core";
|
3
2
|
export interface LiveQueryResult<T extends DocTypes, K extends IndexKeyType, R extends DocFragment = T> {
|
4
3
|
readonly docs: DocWithId<T>[];
|
5
4
|
readonly rows: IndexRow<K, T, R>[];
|
@@ -31,24 +30,19 @@ export interface UseDocumentResultObject<T extends DocTypes> {
|
|
31
30
|
remove(existingDoc?: DocWithId<T>): Promise<DocResponse>;
|
32
31
|
submit(e?: Event): Promise<void>;
|
33
32
|
}
|
34
|
-
export type AttachStatus = "initial" | "attaching" | "attached" | "error";
|
35
33
|
export interface InitialAttachState {
|
36
34
|
readonly state: "initial";
|
37
|
-
readonly ctx: WebCtxHook;
|
38
35
|
}
|
39
36
|
export interface AttachingAttachState {
|
40
37
|
readonly state: "attaching";
|
41
|
-
readonly ctx: WebCtxHook;
|
42
38
|
}
|
43
39
|
export interface AttachedAttachState {
|
44
40
|
readonly state: "attached";
|
45
41
|
readonly attached: Attached;
|
46
|
-
readonly ctx: WebCtxHook;
|
47
42
|
}
|
48
43
|
export interface ErrorAttachState {
|
49
44
|
readonly state: "error";
|
50
45
|
readonly error: Error;
|
51
|
-
readonly ctx: WebCtxHook;
|
52
46
|
}
|
53
47
|
export type AttachState = InitialAttachState | AttachingAttachState | AttachedAttachState | ErrorAttachState;
|
54
48
|
export type UseDocumentResult<T extends DocTypes> = UseDocumentResultObject<T> & UseDocumentResultTuple<T>;
|
@@ -62,30 +56,16 @@ export interface UseFireproof {
|
|
62
56
|
readonly useChanges: UseChanges;
|
63
57
|
readonly attach: AttachState;
|
64
58
|
}
|
65
|
-
export interface InitialTokenAndClaimsState {
|
66
|
-
readonly state: "initial";
|
67
|
-
}
|
68
|
-
export interface ReadyTokenAndClaimsState {
|
69
|
-
readonly state: "ready";
|
70
|
-
readonly tokenAndClaims: TokenAndClaims;
|
71
|
-
readonly reset: () => void;
|
72
|
-
}
|
73
|
-
export interface WebCtxHook {
|
74
|
-
readonly tokenAndClaims: InitialTokenAndClaimsState | ReadyTokenAndClaimsState;
|
75
|
-
}
|
76
59
|
export interface WebToCloudCtx {
|
77
|
-
readonly sthis: SuperThis;
|
78
60
|
readonly dashboardURI: string;
|
79
|
-
readonly
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
setToken(token: TokenAndClaims | string): Promise<void>;
|
86
|
-
token(): Promise<TokenAndClaims | undefined>;
|
61
|
+
readonly uiURI: string;
|
62
|
+
readonly tokenKey: string;
|
63
|
+
onTokenChange(on: (token?: string) => void): void;
|
64
|
+
resetToken(): void;
|
65
|
+
setToken(token: string): void;
|
66
|
+
token(): string | undefined;
|
87
67
|
}
|
88
68
|
export type UseFPConfig = ConfigOpts & {
|
89
|
-
readonly attach?:
|
69
|
+
readonly attach?: Attachable;
|
90
70
|
};
|
91
71
|
//# sourceMappingURL=types.d.ts.map
|
package/react/types.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/react/types.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/react/types.ts"],"names":[],"mappings":"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"}
|
package/react/use-attach.d.ts
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
import { Database
|
2
|
-
import { AttachState
|
3
|
-
import { AppContext } from "@adviser/cement";
|
1
|
+
import { Database } from "@fireproof/core";
|
2
|
+
import { AttachState, UseFPConfig, WebToCloudCtx } from "./types.js";
|
4
3
|
export declare const WebCtx = "webCtx";
|
5
|
-
export
|
6
|
-
|
7
|
-
readonly context?: AppContext;
|
8
|
-
};
|
9
|
-
export declare function defaultWebToCloudOpts(opts: ToCloudParam): WebToCloudCtx;
|
10
|
-
export declare function createAttach(database: Database, config: UseFPConfig): AttachHook;
|
4
|
+
export declare function defaultWebToCloudOpts(opts: Partial<WebToCloudCtx>): WebToCloudCtx;
|
5
|
+
export declare function useAttach(database: Database, config: UseFPConfig): AttachState;
|
11
6
|
//# sourceMappingURL=use-attach.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-attach.d.ts","sourceRoot":"","sources":["../../../../src/react/use-attach.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,
|
1
|
+
{"version":3,"file":"use-attach.d.ts","sourceRoot":"","sources":["../../../../src/react/use-attach.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAgB,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAErE,eAAO,MAAM,MAAM,WAAW,CAAC;AAmD/B,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAEjF;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CA4B9E"}
|
package/react/use-attach.js
CHANGED
@@ -1,168 +1,75 @@
|
|
1
|
-
import {
|
1
|
+
import { falsyToUndef } from "@fireproof/core";
|
2
2
|
import { useEffect, useState } from "react";
|
3
|
-
import { BuildURI, exception2Result, KeyedResolvOnce, ResolveOnce } from "@adviser/cement";
|
4
|
-
import { decodeJwt } from "jose/jwt/decode";
|
5
3
|
export const WebCtx = "webCtx";
|
6
4
|
class WebCtxImpl {
|
7
5
|
constructor(opts) {
|
8
|
-
this.
|
9
|
-
this.
|
10
|
-
this.
|
11
|
-
if (!opts.tokenApiURI) {
|
12
|
-
this.tokenApiURI = BuildURI.from(this.dashboardURI).pathname("/api").toString();
|
13
|
-
}
|
14
|
-
else {
|
15
|
-
this.tokenApiURI = opts.tokenApiURI;
|
16
|
-
}
|
17
|
-
this.tokenParam = opts.tokenParam ?? "fpToken";
|
18
|
-
this.sthis = opts.sthis ?? ensureSuperThis();
|
19
|
-
this.keyBag = opts.keyBag;
|
6
|
+
this.dashboardURI = opts.dashboardURI || "https://dev.connect.fireproof.direct/fp/cloud/api/token";
|
7
|
+
this.uiURI = opts.uiURI || "https://dev.connect.fireproof.direct/api";
|
8
|
+
this.tokenKey = opts.tokenKey || "fpToken";
|
20
9
|
this.opts = opts;
|
21
10
|
}
|
22
|
-
async ready(db) {
|
23
|
-
this.dbId = await db.ledger.refId();
|
24
|
-
this.keyBag = this.keyBag ?? (await db.ledger.opts.keyBag.getBagProvider());
|
25
|
-
}
|
26
|
-
async onAction(token) {
|
27
|
-
for (const action of this.onActions.values()) {
|
28
|
-
action(token);
|
29
|
-
}
|
30
|
-
}
|
31
11
|
onTokenChange(on) {
|
32
12
|
if (this.opts.onTokenChange) {
|
33
13
|
return this.opts.onTokenChange(on);
|
34
14
|
}
|
35
|
-
this.
|
36
|
-
const tc = this._tokenAndClaims.value;
|
37
|
-
if (tc) {
|
38
|
-
on(tc);
|
39
|
-
}
|
40
|
-
return () => {
|
41
|
-
this.onActions.delete(on);
|
42
|
-
};
|
15
|
+
this.onAction = on;
|
43
16
|
}
|
44
|
-
|
17
|
+
token() {
|
45
18
|
if (this.opts.token) {
|
46
19
|
return this.opts.token();
|
47
20
|
}
|
48
|
-
|
49
|
-
const ret = await this.keyBag?.get(`${this.dbId}/urlToken`);
|
50
|
-
if (!ret) {
|
51
|
-
return;
|
52
|
-
}
|
53
|
-
let token;
|
54
|
-
if (rt.isV1StorageKeyItem(ret)) {
|
55
|
-
token = ret.key;
|
56
|
-
}
|
57
|
-
else if (rt.isKeysItem(ret)) {
|
58
|
-
token = ret.keys[this.tokenParam].key;
|
59
|
-
}
|
60
|
-
else {
|
61
|
-
return undefined;
|
62
|
-
}
|
63
|
-
const claims = decodeJwt(token);
|
64
|
-
return {
|
65
|
-
token,
|
66
|
-
claims,
|
67
|
-
};
|
68
|
-
});
|
69
|
-
if (tc) {
|
70
|
-
this.onAction(tc);
|
71
|
-
}
|
72
|
-
return tc;
|
21
|
+
return falsyToUndef(localStorage.getItem(this.tokenKey));
|
73
22
|
}
|
74
|
-
|
23
|
+
resetToken() {
|
75
24
|
if (this.opts.resetToken) {
|
76
|
-
|
25
|
+
this.opts.resetToken();
|
26
|
+
}
|
27
|
+
else {
|
28
|
+
localStorage.removeItem(this.tokenKey);
|
77
29
|
}
|
78
|
-
|
79
|
-
this.onAction();
|
30
|
+
this.onAction?.();
|
80
31
|
}
|
81
|
-
|
32
|
+
setToken(token) {
|
33
|
+
const oldToken = this.token();
|
82
34
|
if (this.opts.setToken) {
|
83
|
-
|
35
|
+
this.opts.setToken(token);
|
84
36
|
}
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
name: `${this.dbId}/urlToken`,
|
91
|
-
keys: {
|
92
|
-
[this.tokenParam]: {
|
93
|
-
key: token.token,
|
94
|
-
fingerPrint: await hashString(token.token),
|
95
|
-
default: false,
|
96
|
-
},
|
97
|
-
},
|
98
|
-
});
|
99
|
-
this.onAction(token);
|
37
|
+
else {
|
38
|
+
localStorage.setItem(this.tokenKey, token);
|
39
|
+
}
|
40
|
+
if (oldToken !== token) {
|
41
|
+
this.onAction?.(token);
|
100
42
|
}
|
101
43
|
}
|
102
44
|
}
|
103
45
|
export function defaultWebToCloudOpts(opts) {
|
104
46
|
return new WebCtxImpl(opts);
|
105
47
|
}
|
106
|
-
|
107
|
-
|
108
|
-
};
|
109
|
-
const prepareWebctxs = new KeyedResolvOnce();
|
110
|
-
export function createAttach(database, config) {
|
111
|
-
const [attachState, setAttachState] = useState({ state: "initial", ctx: initialCtx });
|
48
|
+
export function useAttach(database, config) {
|
49
|
+
const [attachState, setAttachState] = useState({ state: "initial" });
|
112
50
|
useEffect(() => {
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
setAttachState((prev) => ({ ...prev, state: "initial", ctx: initialCtx }));
|
126
|
-
return;
|
127
|
-
}
|
128
|
-
setAttachState((prev) => ({
|
129
|
-
...prev,
|
130
|
-
ctx: {
|
131
|
-
...prev.ctx,
|
132
|
-
tokenAndClaims: {
|
133
|
-
state: "ready",
|
134
|
-
tokenAndClaims: token,
|
135
|
-
reset: () => {
|
136
|
-
webCtx.resetToken().then(() => setAttachState((prev) => ({
|
137
|
-
...prev,
|
138
|
-
state: "initial",
|
139
|
-
ctx: initialCtx,
|
140
|
-
})));
|
141
|
-
},
|
142
|
-
},
|
143
|
-
},
|
144
|
-
}));
|
145
|
-
});
|
146
|
-
const rAttached = await exception2Result(async () => {
|
147
|
-
const ret = await database.attach(attachable);
|
148
|
-
return ret;
|
149
|
-
});
|
150
|
-
if (rAttached.isErr()) {
|
151
|
-
database.logger.Error().Err(rAttached).Msg("attach error");
|
152
|
-
setAttachState((prev) => ({ ...prev, state: "error", error: rAttached.Err() }));
|
153
|
-
}
|
154
|
-
const attached = rAttached.Ok();
|
155
|
-
setAttachState((prev) => ({
|
156
|
-
...prev,
|
157
|
-
state: "attached",
|
158
|
-
attached,
|
159
|
-
}));
|
51
|
+
if (config.attach && attachState.state === "initial") {
|
52
|
+
setAttachState({ state: "attaching" });
|
53
|
+
database
|
54
|
+
.attach(config.attach)
|
55
|
+
.then((a) => {
|
56
|
+
a
|
57
|
+
.ctx()
|
58
|
+
.get(WebCtx)
|
59
|
+
?.onTokenChange((token) => {
|
60
|
+
if (!token) {
|
61
|
+
setAttachState({ state: "initial" });
|
62
|
+
return;
|
160
63
|
}
|
161
|
-
|
162
|
-
}
|
64
|
+
});
|
65
|
+
setAttachState({ state: "attached", attached: a });
|
66
|
+
})
|
67
|
+
.catch((err) => {
|
68
|
+
database.logger.Error().Err(err).Msg("attach error");
|
69
|
+
setAttachState({ state: "error", error: err });
|
163
70
|
});
|
164
|
-
}
|
165
|
-
}, [database, config.attach, attachState
|
71
|
+
}
|
72
|
+
}, [database, config.attach, attachState]);
|
166
73
|
return attachState;
|
167
74
|
}
|
168
75
|
//# sourceMappingURL=use-attach.js.map
|
package/react/use-attach.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-attach.js","sourceRoot":"","sources":["../../../../src/react/use-attach.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,
|
1
|
+
{"version":3,"file":"use-attach.js","sourceRoot":"","sources":["../../../../src/react/use-attach.ts"],"names":[],"mappings":"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"}
|
package/react/use-fireproof.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import { toSortedArray } from "@adviser/cement/utils";
|
2
2
|
import { fireproof } from "@fireproof/core";
|
3
3
|
import { useMemo } from "react";
|
4
|
-
import {
|
4
|
+
import { useAttach } from "./use-attach.js";
|
5
5
|
import { createUseAllDocs } from "./use-all-docs.js";
|
6
6
|
import { createUseChanges } from "./use-changes.js";
|
7
7
|
import { createUseDocument } from "./use-document.js";
|
@@ -10,7 +10,7 @@ export const FireproofCtx = {};
|
|
10
10
|
export function useFireproof(name = "useFireproof", config = {}) {
|
11
11
|
const strConfig = JSON.stringify(toSortedArray(config));
|
12
12
|
const database = useMemo(() => (typeof name === "string" ? fireproof(name, config) : name), [name, strConfig]);
|
13
|
-
const attach =
|
13
|
+
const attach = useAttach(database, config);
|
14
14
|
const useDocument = useMemo(() => createUseDocument(database), [database.name, strConfig]);
|
15
15
|
const useLiveQuery = useMemo(() => createUseLiveQuery(database), [database.name, strConfig]);
|
16
16
|
const useAllDocs = useMemo(() => createUseAllDocs(database), [database.name, strConfig]);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-fireproof.js","sourceRoot":"","sources":["../../../../src/react/use-fireproof.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"use-fireproof.js","sourceRoot":"","sources":["../../../../src/react/use-fireproof.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAKzD,MAAM,CAAC,MAAM,YAAY,GAAG,EAAkB,CAAC;AAgB/C,MAAM,UAAU,YAAY,CAAC,OAA0B,cAAc,EAAE,SAAsB,EAAE;IAC7F,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3F,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAEzF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AACjF,CAAC"}
|
@@ -1,14 +1,10 @@
|
|
1
1
|
import { Result, URI, Logger, ResolveOnce } from "@adviser/cement";
|
2
2
|
import type { SuperThis } from "../../../types.js";
|
3
|
-
import {
|
3
|
+
import { MsgConnected, MsgConnectedAuth } from "../../../protocols/cloud/msger.js";
|
4
4
|
import { SerdeGateway, SerdeGatewayCtx, SerdeGetResult, UnsubscribeResult, VoidResult } from "../../../blockstore/serde-gateway.js";
|
5
5
|
import { FPEnvelope, FPEnvelopeMeta } from "../../../blockstore/fp-envelope.js";
|
6
|
-
export interface VConnItems {
|
7
|
-
readonly conn: Result<VirtualConnected>;
|
8
|
-
readonly citem: ConnectionItem;
|
9
|
-
}
|
10
6
|
type ConnectedSerdeGatewayCtx = SerdeGatewayCtx & {
|
11
|
-
conn:
|
7
|
+
conn: AuthedConnection;
|
12
8
|
};
|
13
9
|
export interface StoreTypeGateway {
|
14
10
|
get: <S>(ctx: ConnectedSerdeGatewayCtx, url: URI) => Promise<SerdeGetResult<S>>;
|
@@ -16,9 +12,13 @@ export interface StoreTypeGateway {
|
|
16
12
|
delete: (ctx: ConnectedSerdeGatewayCtx, url: URI) => Promise<VoidResult>;
|
17
13
|
}
|
18
14
|
interface ConnectionItem {
|
19
|
-
readonly connection: ResolveOnce<Result<
|
15
|
+
readonly connection: ResolveOnce<Result<MsgConnected>>;
|
20
16
|
readonly trackPuts: Set<string>;
|
21
17
|
}
|
18
|
+
export interface AuthedConnection {
|
19
|
+
readonly conn: Result<MsgConnectedAuth>;
|
20
|
+
readonly citem: ConnectionItem;
|
21
|
+
}
|
22
22
|
export declare class FireproofCloudGateway implements SerdeGateway {
|
23
23
|
#private;
|
24
24
|
readonly logger: Logger;
|
@@ -32,7 +32,7 @@ export declare class FireproofCloudGateway implements SerdeGateway {
|
|
32
32
|
close(ctx: SerdeGatewayCtx, uri: URI): Promise<VoidResult>;
|
33
33
|
matchURI(uri: URI): () => string;
|
34
34
|
registerConnectionURI(uri: URI, itemFactory: () => ConnectionItem): void;
|
35
|
-
getCloudConnectionItem(logger: Logger, uri: URI): Promise<
|
35
|
+
getCloudConnectionItem(logger: Logger, uri: URI): Promise<AuthedConnection>;
|
36
36
|
subscribe(ctx: SerdeGatewayCtx, uri: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>): Promise<UnsubscribeResult>;
|
37
37
|
destroy(ctx: SerdeGatewayCtx, uri: URI): Promise<VoidResult>;
|
38
38
|
getPlain(): Promise<Result<Uint8Array>>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/cloud/gateway.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,GAAG,EAGH,MAAM,EAEN,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/cloud/gateway.ts"],"names":[],"mappings":"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"}
|
@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
5
5
|
};
|
6
6
|
var _FireproofCloudGateway_connectionURIs;
|
7
7
|
import { Result, URI, KeyedResolvOnce, exception2Result, param, ResolveOnce, to_uint8, BuildURI, Future, } from "@adviser/cement";
|
8
|
-
import { buildErrorMsg, buildReqOpen, MsgIsError, coerceFPStoreTypes,
|
8
|
+
import { buildErrorMsg, buildReqOpen, MsgIsError, coerceFPStoreTypes, } from "../../../protocols/cloud/msg-types.js";
|
9
9
|
import { Msger, authTypeFromUri } from "../../../protocols/cloud/msger.js";
|
10
10
|
import { MsgIsResDelData, MsgIsResGetData, MsgIsResPutData, } from "../../../protocols/cloud/msg-types-data.js";
|
11
11
|
import { ensureLogger, hashObject, NotFoundError } from "../../../utils.js";
|
@@ -43,7 +43,7 @@ class BaseGateway {
|
|
43
43
|
tid: this.sthis.nextId().str,
|
44
44
|
auth: rAuth.Ok(),
|
45
45
|
type,
|
46
|
-
conn:
|
46
|
+
conn: conn.conn.Ok().conn,
|
47
47
|
tenant: {
|
48
48
|
tenant: params.tenant,
|
49
49
|
ledger: params.ledger,
|
@@ -176,7 +176,7 @@ class CurrentMeta {
|
|
176
176
|
this.subscriptions = subscriptions;
|
177
177
|
}
|
178
178
|
async get(ctx, authType, reqSignedUrl, gwCtx) {
|
179
|
-
const key = await hashObject(ctx.conn.conn.Ok());
|
179
|
+
const key = await hashObject(ctx.conn.conn.Ok().conn);
|
180
180
|
const item = this.boundGetMeta.get(key);
|
181
181
|
item
|
182
182
|
.once(async () => {
|
@@ -250,7 +250,7 @@ class MetaGateway extends BaseGateway {
|
|
250
250
|
if (rGwCtx.isErr()) {
|
251
251
|
return Result.Err(rGwCtx);
|
252
252
|
}
|
253
|
-
const rAuthType = await
|
253
|
+
const rAuthType = await ctx.conn.conn.Ok().authType();
|
254
254
|
if (rAuthType.isErr()) {
|
255
255
|
return Result.Err(rAuthType);
|
256
256
|
}
|
@@ -266,11 +266,11 @@ class MetaGateway extends BaseGateway {
|
|
266
266
|
if (MsgIsError(reqSignedUrl)) {
|
267
267
|
return this.logger.Error().Err(reqSignedUrl).Msg("Error in buildReqSignedUrl").ResultError();
|
268
268
|
}
|
269
|
-
const rGwCtx = getGwCtx(ctx.conn.conn.Ok().
|
269
|
+
const rGwCtx = getGwCtx(ctx.conn.conn.Ok().conn, uri);
|
270
270
|
if (rGwCtx.isErr()) {
|
271
271
|
return Result.Err(rGwCtx);
|
272
272
|
}
|
273
|
-
const rAuthType = await
|
273
|
+
const rAuthType = await ctx.conn.conn.Ok().authType();
|
274
274
|
if (rAuthType.isErr()) {
|
275
275
|
return Result.Err(rAuthType);
|
276
276
|
}
|
@@ -297,7 +297,7 @@ class MetaGateway extends BaseGateway {
|
|
297
297
|
if (rGwCtx.isErr()) {
|
298
298
|
return Result.Err(rGwCtx);
|
299
299
|
}
|
300
|
-
const rAuthType = await
|
300
|
+
const rAuthType = await ctx.conn.conn.Ok().authType();
|
301
301
|
if (rAuthType.isErr()) {
|
302
302
|
return Result.Err(rAuthType);
|
303
303
|
}
|
@@ -436,13 +436,8 @@ export class FireproofCloudGateway {
|
|
436
436
|
return this.logger.Error().Err(rConn).Msg("Error in getCloudConnection").ResultError();
|
437
437
|
}
|
438
438
|
const conn = rConn.conn.Ok();
|
439
|
-
const rAuth = await
|
440
|
-
|
441
|
-
this.logger.Error().Err(rAuth).Msg("Error in authTypeFromUri").ResultError();
|
442
|
-
}
|
443
|
-
else {
|
444
|
-
await conn.close(buildReqClose(this.sthis, rAuth.Ok(), conn.conn));
|
445
|
-
}
|
439
|
+
const rAuth = await conn.msgConnAuth();
|
440
|
+
await conn.close(rAuth.Ok());
|
446
441
|
__classPrivateFieldGet(this, _FireproofCloudGateway_connectionURIs, "f").unget(this.matchURI(uri)());
|
447
442
|
return Result.Ok(undefined);
|
448
443
|
}
|
@@ -476,7 +471,7 @@ export class FireproofCloudGateway {
|
|
476
471
|
if (!item.ready || !bestMatch) {
|
477
472
|
return { conn: logger.Error().Url(uri).Msg("Connection not ready").ResultError(), citem: {} };
|
478
473
|
}
|
479
|
-
const
|
474
|
+
const conn = await bestMatch.connection.once(async () => {
|
480
475
|
const rParams = uri.getParamsResult({
|
481
476
|
protocol: "https",
|
482
477
|
});
|
@@ -490,9 +485,12 @@ export class FireproofCloudGateway {
|
|
490
485
|
}
|
491
486
|
const qOpen = buildReqOpen(this.sthis, rAuth.Ok(), {});
|
492
487
|
const cUrl = uri.build().protocol(params.protocol).cleanParams().URI();
|
493
|
-
return Msger.connect(this.sthis, cUrl, qOpen);
|
488
|
+
return Msger.connect(this.sthis, rAuth.Ok(), cUrl, qOpen);
|
494
489
|
});
|
495
|
-
|
490
|
+
if (conn.isErr()) {
|
491
|
+
return { conn: Result.Err(conn), citem: bestMatch };
|
492
|
+
}
|
493
|
+
return { conn: Result.Ok(conn.Ok().attachAuth(() => authTypeFromUri(this.logger, uri))), citem: bestMatch };
|
496
494
|
}
|
497
495
|
async subscribe(ctx, uri, callback) {
|
498
496
|
const metaGw = getStoreTypeGateway(ctx.loader.sthis, uri);
|