@welshman/app 0.4.6 → 0.5.0

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.
Files changed (53) hide show
  1. package/dist/app/src/index.d.ts +0 -2
  2. package/dist/app/src/index.d.ts.map +1 -1
  3. package/dist/app/src/index.js +0 -2
  4. package/dist/app/src/index.js.map +1 -1
  5. package/dist/app/src/thunk.d.ts +1 -0
  6. package/dist/app/src/thunk.d.ts.map +1 -1
  7. package/dist/app/src/thunk.js +11 -2
  8. package/dist/app/src/thunk.js.map +1 -1
  9. package/dist/net/src/request.d.ts.map +1 -1
  10. package/dist/net/src/request.js +2 -12
  11. package/dist/net/src/request.js.map +1 -1
  12. package/dist/signer/src/signers/nip01.d.ts +2 -10
  13. package/dist/signer/src/signers/nip01.d.ts.map +1 -1
  14. package/dist/signer/src/signers/nip01.js +2 -2
  15. package/dist/signer/src/signers/nip01.js.map +1 -1
  16. package/dist/signer/src/signers/nip07.d.ts +2 -2
  17. package/dist/signer/src/signers/nip07.d.ts.map +1 -1
  18. package/dist/signer/src/signers/nip07.js +4 -6
  19. package/dist/signer/src/signers/nip07.js.map +1 -1
  20. package/dist/signer/src/signers/nip46.d.ts +2 -2
  21. package/dist/signer/src/signers/nip46.d.ts.map +1 -1
  22. package/dist/signer/src/signers/nip46.js +2 -2
  23. package/dist/signer/src/signers/nip46.js.map +1 -1
  24. package/dist/signer/src/signers/nip55.d.ts +2 -2
  25. package/dist/signer/src/signers/nip55.d.ts.map +1 -1
  26. package/dist/signer/src/signers/nip55.js +9 -12
  27. package/dist/signer/src/signers/nip55.js.map +1 -1
  28. package/dist/signer/src/util.d.ts +7 -2
  29. package/dist/signer/src/util.d.ts.map +1 -1
  30. package/dist/signer/src/util.js +6 -2
  31. package/dist/signer/src/util.js.map +1 -1
  32. package/dist/tsconfig.build.tsbuildinfo +1 -1
  33. package/dist/util/src/Blossom.d.ts +14 -5
  34. package/dist/util/src/Blossom.d.ts.map +1 -1
  35. package/dist/util/src/Blossom.js +29 -26
  36. package/dist/util/src/Blossom.js.map +1 -1
  37. package/dist/util/src/Events.d.ts +1 -0
  38. package/dist/util/src/Events.d.ts.map +1 -1
  39. package/dist/util/src/Events.js +32 -8
  40. package/dist/util/src/Events.js.map +1 -1
  41. package/dist/util/src/Wallet.d.ts +9 -4
  42. package/dist/util/src/Wallet.d.ts.map +1 -1
  43. package/dist/util/src/Wallet.js +4 -1
  44. package/dist/util/src/Wallet.js.map +1 -1
  45. package/package.json +9 -10
  46. package/dist/app/src/storage.d.ts +0 -22
  47. package/dist/app/src/storage.d.ts.map +0 -1
  48. package/dist/app/src/storage.js +0 -81
  49. package/dist/app/src/storage.js.map +0 -1
  50. package/dist/app/src/storageAdapters.d.ts +0 -88
  51. package/dist/app/src/storageAdapters.d.ts.map +0 -1
  52. package/dist/app/src/storageAdapters.js +0 -181
  53. package/dist/app/src/storageAdapters.js.map +0 -1
@@ -37,8 +37,8 @@ export class WrappedSigner extends Emitter {
37
37
  this.signer = signer;
38
38
  this.wrapMethod = wrapMethod;
39
39
  }
40
- sign(event) {
41
- return this.wrapMethod("sign", () => this.signer.sign(event));
40
+ sign(event, options = {}) {
41
+ return this.wrapMethod("sign", () => this.signer.sign(event, options));
42
42
  }
43
43
  getPubkey() {
44
44
  return this.wrapMethod("getPubkey", () => this.signer.getPubkey());
@@ -52,4 +52,8 @@ export class WrappedSigner extends Emitter {
52
52
  decrypt: async (pubkey, message) => this.wrapMethod("nip44.decrypt", () => this.signer.nip44.decrypt(pubkey, message)),
53
53
  };
54
54
  }
55
+ export const signWithOptions = (promise, options) => new Promise((resolve, reject) => {
56
+ Promise.resolve(promise).then(resolve).catch(reject);
57
+ options.signal?.addEventListener("abort", () => reject("Signing was aborted"));
58
+ });
55
59
  //# sourceMappingURL=util.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../signer/src/util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../signer/src/util.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"root":["../src/blossom.ts","../src/commands.ts","../src/context.ts","../src/core.ts","../src/feeds.ts","../src/follows.ts","../src/handles.ts","../src/inboxrelayselections.ts","../src/index.ts","../src/mutes.ts","../src/pins.ts","../src/plaintext.ts","../src/profiles.ts","../src/relayselections.ts","../src/relays.ts","../src/search.ts","../src/session.ts","../src/storage.ts","../src/storageadapters.ts","../src/sync.ts","../src/tags.ts","../src/thunk.ts","../src/topics.ts","../src/user.ts","../src/wot.ts","../src/zappers.ts"],"version":"5.8.2"}
1
+ {"root":["../src/blossom.ts","../src/commands.ts","../src/context.ts","../src/core.ts","../src/feeds.ts","../src/follows.ts","../src/handles.ts","../src/inboxrelayselections.ts","../src/index.ts","../src/mutes.ts","../src/pins.ts","../src/plaintext.ts","../src/profiles.ts","../src/relayselections.ts","../src/relays.ts","../src/search.ts","../src/session.ts","../src/sync.ts","../src/tags.ts","../src/thunk.ts","../src/topics.ts","../src/user.ts","../src/wot.ts","../src/zappers.ts"],"version":"5.8.2"}
@@ -22,26 +22,35 @@ export declare const makeBlossomAuthEvent: ({ action, server, hashes, expiration
22
22
  created_at: number;
23
23
  };
24
24
  export declare const buildBlobUrl: (server: string, sha256: string, extension?: string) => string;
25
- export declare const checkBlobExists: (server: string, sha256: string, options?: {
25
+ export declare const checkBlobExists: (server: string, sha256: string, { headers, authEvent, }?: {
26
+ headers?: Record<string, string>;
26
27
  authEvent?: SignedEvent;
27
28
  }) => Promise<{
28
29
  exists: boolean;
29
30
  size?: number;
30
31
  }>;
31
- export declare const getBlob: (server: string, sha256: string, options?: {
32
+ export declare const getBlob: (server: string, sha256: string, { headers, authEvent, range, }?: {
33
+ headers?: Record<string, string>;
32
34
  authEvent?: SignedEvent;
33
35
  range?: {
34
36
  start: number;
35
37
  end?: number;
36
38
  };
37
39
  }) => Promise<Response>;
38
- export declare const uploadBlob: (server: string, blob: Blob | ArrayBuffer, options?: {
40
+ export declare const canUploadBlob: (server: string, { headers, authEvent, }?: {
41
+ headers?: Record<string, string>;
39
42
  authEvent?: SignedEvent;
40
43
  }) => Promise<Response>;
41
- export declare const deleteBlob: (server: string, sha256: string, options?: {
44
+ export declare const uploadBlob: (server: string, blob: Blob | ArrayBuffer, { headers, authEvent, }?: {
45
+ headers?: Record<string, string>;
42
46
  authEvent?: SignedEvent;
43
47
  }) => Promise<Response>;
44
- export declare const listBlobs: (server: string, pubkey: string, options?: {
48
+ export declare const deleteBlob: (server: string, sha256: string, { headers, authEvent, }?: {
49
+ headers?: Record<string, string>;
50
+ authEvent?: SignedEvent;
51
+ }) => Promise<Response>;
52
+ export declare const listBlobs: (server: string, pubkey: string, { headers, authEvent, since, until, }?: {
53
+ headers?: Record<string, string>;
45
54
  authEvent?: SignedEvent;
46
55
  since?: number;
47
56
  until?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"Blossom.d.ts","sourceRoot":"","sources":["../../../../util/src/Blossom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,WAAW,EAAC,MAAM,aAAa,CAAA;AAGlD,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEpE,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,iBAAiB,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,kDAMlC,oBAAoB;;;;;CAiBtB,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,YAAY,MAAM,KAAG,MAIjF,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAS;IACP,SAAS,CAAC,EAAE,WAAW,CAAA;CACnB,KACL,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,CAuB1C,CAAA;AAED,eAAO,MAAM,OAAO,GAClB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAS;IACP,SAAS,CAAC,EAAE,WAAW,CAAA;IACvB,KAAK,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAC,CAAA;CACjC,sBAgBP,CAAA;AAED,eAAO,MAAM,UAAU,GACrB,QAAQ,MAAM,EACd,MAAM,IAAI,GAAG,WAAW,EACxB,UAAS;IACP,SAAS,CAAC,EAAE,WAAW,CAAA;CACnB,sBAYP,CAAA;AAED,eAAO,MAAM,UAAU,GACrB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAS;IACP,SAAS,CAAC,EAAE,WAAW,CAAA;CACnB,sBAWP,CAAA;AAED,eAAO,MAAM,SAAS,GACpB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAS;IACP,SAAS,CAAC,EAAE,WAAW,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACV,sBAsBP,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAgBpE;AAED,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACH,KAAK,EACL,UAAU,EACV,SAAS,GACV,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAarC"}
1
+ {"version":3,"file":"Blossom.d.ts","sourceRoot":"","sources":["../../../../util/src/Blossom.ts"],"names":[],"mappings":"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"}
@@ -22,11 +22,10 @@ export const buildBlobUrl = (server, sha256, extension) => {
22
22
  const filename = extension ? `${sha256}.${extension}` : sha256;
23
23
  return `${url.origin}/${filename}`;
24
24
  };
25
- export const checkBlobExists = async (server, sha256, options = {}) => {
25
+ export const checkBlobExists = async (server, sha256, { headers = {}, authEvent, } = {}) => {
26
26
  const url = buildBlobUrl(server, sha256);
27
- const headers = {};
28
- if (options.authEvent) {
29
- headers.Authorization = makeHttpAuthHeader(options.authEvent);
27
+ if (authEvent) {
28
+ headers.Authorization = makeHttpAuthHeader(authEvent);
30
29
  }
31
30
  try {
32
31
  const response = await fetch(url, { method: "HEAD", headers });
@@ -43,50 +42,54 @@ export const checkBlobExists = async (server, sha256, options = {}) => {
43
42
  throw new Error(`Failed to check blob existence: ${error}`);
44
43
  }
45
44
  };
46
- export const getBlob = async (server, sha256, options = {}) => {
45
+ export const getBlob = async (server, sha256, { headers = {}, authEvent, range, } = {}) => {
47
46
  const url = buildBlobUrl(server, sha256);
48
- const headers = {};
49
- if (options.authEvent) {
50
- headers.Authorization = makeHttpAuthHeader(options.authEvent);
47
+ if (authEvent) {
48
+ headers.Authorization = makeHttpAuthHeader(authEvent);
51
49
  }
52
- if (options.range) {
53
- const { end, start } = options.range;
50
+ if (range) {
51
+ const { end, start } = range;
54
52
  headers.Range = end !== undefined ? `bytes=${start}-${end}` : `bytes=${start}-`;
55
53
  }
56
54
  return fetch(url, { headers });
57
55
  };
58
- export const uploadBlob = async (server, blob, options = {}) => {
56
+ export const canUploadBlob = async (server, { headers = {}, authEvent, } = {}) => {
57
+ const url = new URL(server);
58
+ const uploadUrl = `${url.origin}/upload`;
59
+ if (authEvent) {
60
+ headers.Authorization = makeHttpAuthHeader(authEvent);
61
+ }
62
+ return fetch(uploadUrl, { method: "HEAD", headers });
63
+ };
64
+ export const uploadBlob = async (server, blob, { headers = {}, authEvent, } = {}) => {
59
65
  const url = new URL(server);
60
66
  const uploadUrl = `${url.origin}/upload`;
61
67
  const body = blob instanceof Blob ? blob : new Blob([blob]);
62
- const headers = {};
63
- if (options.authEvent) {
64
- headers.Authorization = makeHttpAuthHeader(options.authEvent);
68
+ if (authEvent) {
69
+ headers.Authorization = makeHttpAuthHeader(authEvent);
65
70
  }
66
71
  return fetch(uploadUrl, { method: "PUT", headers, body });
67
72
  };
68
- export const deleteBlob = async (server, sha256, options = {}) => {
73
+ export const deleteBlob = async (server, sha256, { headers = {}, authEvent, } = {}) => {
69
74
  const url = buildBlobUrl(server, sha256);
70
- const headers = {};
71
- if (options.authEvent) {
72
- headers.Authorization = makeHttpAuthHeader(options.authEvent);
75
+ if (authEvent) {
76
+ headers.Authorization = makeHttpAuthHeader(authEvent);
73
77
  }
74
78
  return fetch(url, { method: "DELETE", headers });
75
79
  };
76
- export const listBlobs = async (server, pubkey, options = {}) => {
80
+ export const listBlobs = async (server, pubkey, { headers = {}, authEvent, since, until, } = {}) => {
77
81
  const url = new URL(server);
78
82
  const listUrl = `${url.origin}/list/${pubkey}`;
79
83
  const searchParams = new URLSearchParams();
80
- if (options.since !== undefined) {
81
- searchParams.append("since", options.since.toString());
84
+ if (since !== undefined) {
85
+ searchParams.append("since", since.toString());
82
86
  }
83
- if (options.until !== undefined) {
84
- searchParams.append("until", options.until.toString());
87
+ if (until !== undefined) {
88
+ searchParams.append("until", until.toString());
85
89
  }
86
90
  const fullUrl = searchParams.toString() ? `${listUrl}?${searchParams.toString()}` : listUrl;
87
- const headers = {};
88
- if (options.authEvent) {
89
- headers.Authorization = makeHttpAuthHeader(options.authEvent);
91
+ if (authEvent) {
92
+ headers.Authorization = makeHttpAuthHeader(authEvent);
90
93
  }
91
94
  return fetch(fullUrl, { headers });
92
95
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Blossom.js","sourceRoot":"","sources":["../../../../util/src/Blossom.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Blossom.js","sourceRoot":"","sources":["../../../../util/src/Blossom.ts"],"names":[],"mappings":"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"}
@@ -56,6 +56,7 @@ export declare const asTrustedEvent: (e: TrustedEvent) => TrustedEvent;
56
56
  export declare const getIdentifier: (e: EventTemplate) => string | undefined;
57
57
  export declare const getIdOrAddress: (e: HashedEvent) => string;
58
58
  export declare const getIdAndAddress: (e: HashedEvent) => string[];
59
+ export declare const deduplicateEvents: (events: TrustedEvent[]) => TrustedEvent[];
59
60
  export declare const isEphemeral: (e: EventTemplate) => boolean;
60
61
  export declare const isReplaceable: (e: EventTemplate) => boolean;
61
62
  export declare const isPlainReplaceable: (e: EventTemplate) => boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"Events.d.ts","sourceRoot":"","sources":["../../../../util/src/Events.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Events.d.ts","sourceRoot":"","sources":["../../../../util/src/Events.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { verifiedSymbol, verifyEvent as verifyEventPure } from "nostr-tools/pure";
2
2
  import { setNostrWasm, verifyEvent as verifyEventWasm } from "nostr-tools/wasm";
3
3
  import { initNostrWasm } from "nostr-wasm";
4
- import { mapVals, first, pick, now } from "@welshman/lib";
4
+ import { mapVals, lte, first, pick, now } from "@welshman/lib";
5
5
  import { getReplyTags, getCommentTags, getReplyTagValues, getCommentTagValues } from "./Tags.js";
6
6
  import { getAddress, Address } from "./Address.js";
7
7
  import { COMMENT, isEphemeralKind, isReplaceableKind, isPlainReplaceableKind, isParameterizedReplaceableKind, } from "./Kinds.js";
@@ -18,15 +18,29 @@ export const verifyEvent = (() => {
18
18
  console.warn(e);
19
19
  });
20
20
  }
21
- return (event) => Boolean(event.sig && (event[verifiedSymbol] || verify(event)));
21
+ return (event) => {
22
+ if (!isSignedEvent(event))
23
+ return false;
24
+ if (event[verifiedSymbol])
25
+ return true;
26
+ return verify(event);
27
+ };
22
28
  })();
23
29
  // Type guards
24
- export const isEventTemplate = (e) => Boolean(typeof e.kind === "number" && Array.isArray(e.tags) && typeof e.content === "string");
25
- export const isStampedEvent = (e) => Boolean(isEventTemplate(e) && e.created_at >= 0);
26
- export const isOwnedEvent = (e) => Boolean(isStampedEvent(e) && e.pubkey);
27
- export const isHashedEvent = (e) => Boolean(isOwnedEvent(e) && e.id);
28
- export const isSignedEvent = (e) => Boolean(isHashedEvent(e) && e.sig);
29
- export const isUnwrappedEvent = (e) => Boolean(isHashedEvent(e) && e.wrap);
30
+ export const isEventTemplate = (e) => {
31
+ if (!e)
32
+ return false;
33
+ if (e.kind % 1 !== 0)
34
+ return false;
35
+ if (typeof e.content !== "string")
36
+ return false;
37
+ return e.tags?.every?.(t => t?.every?.(x => typeof x === "string"));
38
+ };
39
+ export const isStampedEvent = (e) => Boolean(isEventTemplate(e) && e.created_at >= 0 && e.created_at % 1 === 0);
40
+ export const isOwnedEvent = (e) => Boolean(isStampedEvent(e) && typeof e.pubkey === "string" && e.pubkey.length === 64);
41
+ export const isHashedEvent = (e) => Boolean(isOwnedEvent(e) && typeof e.id === "string" && e.id.length === 64);
42
+ export const isSignedEvent = (e) => Boolean(isHashedEvent(e) && typeof e.sig === "string" && e.sig.length > 0);
43
+ export const isUnwrappedEvent = (e) => Boolean(isHashedEvent(e) && e.wrap && isSignedEvent(e.wrap));
30
44
  export const isTrustedEvent = (e) => isSignedEvent(e) || isUnwrappedEvent(e);
31
45
  // Type coercion and attribute stripping
32
46
  export const asEventTemplate = (e) => pick(["kind", "tags", "content"], e);
@@ -40,6 +54,16 @@ export const asTrustedEvent = (e) => pick(["kind", "tags", "content", "created_a
40
54
  export const getIdentifier = (e) => e.tags.find(t => t[0] === "d")?.[1];
41
55
  export const getIdOrAddress = (e) => (isReplaceable(e) ? getAddress(e) : e.id);
42
56
  export const getIdAndAddress = (e) => isReplaceable(e) ? [e.id, getAddress(e)] : [e.id];
57
+ export const deduplicateEvents = (events) => {
58
+ const eventsByKey = new Map();
59
+ for (const event of events) {
60
+ const key = getIdOrAddress(event);
61
+ if (lte(eventsByKey.get(key)?.created_at, event.created_at)) {
62
+ eventsByKey.set(key, event);
63
+ }
64
+ }
65
+ return Array.from(eventsByKey.values());
66
+ };
43
67
  export const isEphemeral = (e) => isEphemeralKind(e.kind);
44
68
  export const isReplaceable = (e) => isReplaceableKind(e.kind);
45
69
  export const isPlainReplaceable = (e) => isPlainReplaceableKind(e.kind);
@@ -1 +1 @@
1
- {"version":3,"file":"Events.js","sourceRoot":"","sources":["../../../../util/src/Events.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Events.js","sourceRoot":"","sources":["../../../../util/src/Events.ts"],"names":[],"mappings":"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"}
@@ -14,14 +14,19 @@ export type NWCInfo = {
14
14
  nostrWalletConnectUrl: string;
15
15
  };
16
16
  export declare enum WalletType {
17
- WebLn = "webln",
17
+ WebLN = "webln",
18
18
  NWC = "nwc"
19
19
  }
20
- export type Wallet = {
21
- type: WalletType.WebLn;
20
+ export type WebLNWallet = {
21
+ type: WalletType.WebLN;
22
22
  info: WebLNInfo;
23
- } | {
23
+ };
24
+ export type NWCWallet = {
24
25
  type: WalletType.NWC;
25
26
  info: NWCInfo;
26
27
  };
28
+ export type Wallet = WebLNWallet | NWCWallet;
29
+ export declare const isWebLNWallet: (wallet: Wallet) => wallet is WebLNWallet;
30
+ export declare const isNWCWallet: (wallet: Wallet) => wallet is NWCWallet;
31
+ export declare const getWalletAddress: (wallet: Wallet) => string | undefined;
27
32
  //# sourceMappingURL=Wallet.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Wallet.d.ts","sourceRoot":"","sources":["../../../../util/src/Wallet.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE;QACL,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,qBAAqB,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,oBAAY,UAAU;IACpB,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ;AAED,MAAM,MAAM,MAAM,GACd;IACE,IAAI,EAAE,UAAU,CAAC,KAAK,CAAA;IACtB,IAAI,EAAE,SAAS,CAAA;CAChB,GACD;IACE,IAAI,EAAE,UAAU,CAAC,GAAG,CAAA;IACpB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA"}
1
+ {"version":3,"file":"Wallet.d.ts","sourceRoot":"","sources":["../../../../util/src/Wallet.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE;QACL,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,qBAAqB,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,oBAAY,UAAU;IACpB,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,UAAU,CAAC,KAAK,CAAA;IACtB,IAAI,EAAE,SAAS,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,UAAU,CAAC,GAAG,CAAA;IACpB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,WAAW,GAAG,SAAS,CAAA;AAE5C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,MAAM,IAAI,WACvB,CAAA;AAElC,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,KAAG,MAAM,IAAI,SAA2C,CAAA;AAElG,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,uBACM,CAAA"}
@@ -1,6 +1,9 @@
1
1
  export var WalletType;
2
2
  (function (WalletType) {
3
- WalletType["WebLn"] = "webln";
3
+ WalletType["WebLN"] = "webln";
4
4
  WalletType["NWC"] = "nwc";
5
5
  })(WalletType || (WalletType = {}));
6
+ export const isWebLNWallet = (wallet) => wallet.type === WalletType.WebLN;
7
+ export const isNWCWallet = (wallet) => wallet.type === WalletType.NWC;
8
+ export const getWalletAddress = (wallet) => isNWCWallet(wallet) ? wallet.info.lud16 : undefined;
6
9
  //# sourceMappingURL=Wallet.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Wallet.js","sourceRoot":"","sources":["../../../../util/src/Wallet.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,yBAAW,CAAA;AACb,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}
1
+ {"version":3,"file":"Wallet.js","sourceRoot":"","sources":["../../../../util/src/Wallet.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,yBAAW,CAAA;AACb,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAcD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAyB,EAAE,CACrE,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,KAAK,CAAA;AAElC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAuB,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,CAAA;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,EAAE,CACjD,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@welshman/app",
3
- "version": "0.4.6",
3
+ "version": "0.5.0",
4
4
  "author": "hodlbod",
5
5
  "license": "MIT",
6
6
  "description": "A collection of svelte stores for use in building nostr client applications.",
@@ -16,17 +16,16 @@
16
16
  "dependencies": {
17
17
  "@types/throttle-debounce": "^5.0.2",
18
18
  "fuse.js": "^7.0.0",
19
- "idb": "^8.0.0",
20
19
  "svelte": "^4.2.18",
21
20
  "throttle-debounce": "^5.0.2",
22
- "@welshman/router": "0.4.6",
23
- "@welshman/feeds": "0.4.6",
24
- "@welshman/lib": "0.4.6",
25
- "@welshman/store": "0.4.6",
26
- "@welshman/relay": "0.4.6",
27
- "@welshman/util": "0.4.6",
28
- "@welshman/net": "0.4.6",
29
- "@welshman/signer": "0.4.6"
21
+ "@welshman/lib": "0.5.0",
22
+ "@welshman/net": "0.5.0",
23
+ "@welshman/feeds": "0.5.0",
24
+ "@welshman/store": "0.5.0",
25
+ "@welshman/signer": "0.5.0",
26
+ "@welshman/router": "0.5.0",
27
+ "@welshman/relay": "0.5.0",
28
+ "@welshman/util": "0.5.0"
30
29
  },
31
30
  "devDependencies": {
32
31
  "rimraf": "~6.0.0",
@@ -1,22 +0,0 @@
1
- import { IDBPDatabase } from "idb";
2
- import { Unsubscriber } from "svelte/store";
3
- export type StorageAdapterOptions = {
4
- throttle?: number;
5
- migrate?: (items: any[]) => any[];
6
- };
7
- export type StorageAdapter = {
8
- keyPath: string;
9
- init: () => Promise<void>;
10
- sync: () => Unsubscriber;
11
- };
12
- export declare let db: IDBPDatabase | undefined;
13
- export declare const ready: import("@welshman/lib").Deferred<void, void>;
14
- export declare const dead: import("@welshman/store").WritableWithGetter<boolean>;
15
- export declare const unsubscribers: Unsubscriber[];
16
- export declare const getAll: (name: string) => Promise<any[]>;
17
- export declare const bulkPut: (name: string, data: any[]) => Promise<void>;
18
- export declare const bulkDelete: (name: string, ids: string[]) => Promise<void>;
19
- export declare const initStorage: (name: string, version: number, adapters: Record<string, StorageAdapter>) => Promise<void>;
20
- export declare const closeStorage: () => Promise<void>;
21
- export declare const clearStorage: () => Promise<void>;
22
- //# sourceMappingURL=storage.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,KAAK,CAAA;AAEhC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAIzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,EAAE,MAAM,YAAY,CAAA;CACzB,CAAA;AAED,eAAO,IAAI,EAAE,EAAE,YAAY,GAAG,SAAS,CAAA;AAEvC,eAAO,MAAM,KAAK,8CAAgB,CAAA;AAElC,eAAO,MAAM,IAAI,uDAA8B,CAAA;AAE/C,eAAO,MAAM,aAAa,EAAE,YAAY,EAAO,CAAA;AAE/C,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,mBAUxC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,kBAiBtD,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,kBAQ3D,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,UAAU,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,kBAuCzC,CAAA;AAED,eAAO,MAAM,YAAY,qBAIxB,CAAA;AAED,eAAO,MAAM,YAAY,qBAMxB,CAAA"}
@@ -1,81 +0,0 @@
1
- import { openDB, deleteDB } from "idb";
2
- import { writable } from "svelte/store";
3
- import { call, defer } from "@welshman/lib";
4
- import { withGetter } from "@welshman/store";
5
- export let db;
6
- export const ready = defer();
7
- export const dead = withGetter(writable(false));
8
- export const unsubscribers = [];
9
- export const getAll = async (name) => {
10
- await ready;
11
- const tx = db.transaction(name, "readwrite");
12
- const store = tx.objectStore(name);
13
- const result = await store.getAll();
14
- await tx.done;
15
- return result;
16
- };
17
- export const bulkPut = async (name, data) => {
18
- await ready;
19
- const tx = db.transaction(name, "readwrite");
20
- const store = tx.objectStore(name);
21
- await Promise.all(data.map(item => {
22
- try {
23
- store.put(item);
24
- }
25
- catch (e) {
26
- console.error(e, item);
27
- }
28
- }));
29
- await tx.done;
30
- };
31
- export const bulkDelete = async (name, ids) => {
32
- await ready;
33
- const tx = db.transaction(name, "readwrite");
34
- const store = tx.objectStore(name);
35
- await Promise.all(ids.map(id => store.delete(id)));
36
- await tx.done;
37
- };
38
- export const initStorage = async (name, version, adapters) => {
39
- if (!window.indexedDB)
40
- return;
41
- window.addEventListener("beforeunload", () => closeStorage());
42
- if (db) {
43
- throw new Error("Db initialized multiple times");
44
- }
45
- db = await openDB(name, version, {
46
- upgrade(db) {
47
- const names = Object.keys(adapters);
48
- for (const name of db.objectStoreNames) {
49
- if (!names.includes(name)) {
50
- db.deleteObjectStore(name);
51
- }
52
- }
53
- for (const [name, { keyPath }] of Object.entries(adapters)) {
54
- try {
55
- db.createObjectStore(name, { keyPath });
56
- }
57
- catch (e) {
58
- console.warn(e);
59
- }
60
- }
61
- },
62
- });
63
- ready.resolve();
64
- await Promise.all(Object.values(adapters).map(async (adapter) => {
65
- await adapter.init();
66
- unsubscribers.push(adapter.sync());
67
- }));
68
- };
69
- export const closeStorage = async () => {
70
- dead.set(true);
71
- unsubscribers.forEach(call);
72
- await db?.close();
73
- };
74
- export const clearStorage = async () => {
75
- if (db) {
76
- await closeStorage();
77
- await deleteDB(db.name);
78
- db = undefined; // force initStorage to run again in tests
79
- }
80
- };
81
- //# sourceMappingURL=storage.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/storage.ts"],"names":[],"mappings":"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"}