@peerbit/time 2.0.7 → 2.0.8-263159d

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 (5) hide show
  1. package/dist/src/wait.d.ts.map +1 -1
  2. package/dist/src/wait.js +19 -1
  3. package/dist/src/wait.js.map +1 -1
  4. package/package.json +60 -60
  5. package/src/wait.ts +19 -1
package/dist/src/wait.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,UAAW,SAAQ,KAAK;CAAG;AACxC,eAAO,MAAM,KAAK,OAAc,MAAM,YAAY;IAAE,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,kBAYzE,CAAC;AASF,eAAO,MAAM,OAAO,GAAU,CAAC,MAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,YACf;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,KACC,OAAO,CAAC,CAAC,GAAG,SAAS,CAwBvB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,CAAC,MAClC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,YACf;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,KACC,OAAO,CAAC,CAAC,CAgCX,CAAC"}
1
+ {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,UAAW,SAAQ,KAAK;CAAG;AACxC,eAAO,MAAM,KAAK,GAAU,IAAI,MAAM,EAAE,UAAU;IAAE,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,kBAYzE,CAAC;AASF,eAAO,MAAM,OAAO,GAAU,CAAC,EAC9B,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACxB,UAAS;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACqB,KAC5C,OAAO,CAAC,CAAC,GAAG,SAAS,CAiCvB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,CAAC,EACtC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACxB,UAAS;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACoB,KAC3C,OAAO,CAAC,CAAC,CAyCX,CAAC"}
package/dist/src/wait.js CHANGED
@@ -23,11 +23,16 @@ export const waitFor = async (fn, options = { timeout: 10 * 1000, delayInterval:
23
23
  const timeout = options.timeout || 10 * 1000;
24
24
  const startTime = Number(new Date());
25
25
  let stop = false;
26
+ let aborted = false;
26
27
  const handleAbort = () => {
27
28
  stop = true;
29
+ aborted = true;
28
30
  options.signal?.removeEventListener("abort", handleAbort);
29
31
  };
30
32
  options.signal?.addEventListener("abort", handleAbort);
33
+ if (options?.signal?.aborted) {
34
+ handleAbort();
35
+ }
31
36
  // eslint-disable-next-line no-unmodified-loop-condition
32
37
  while (!stop && Number(new Date()) - startTime < timeout) {
33
38
  const result = await fn();
@@ -37,7 +42,12 @@ export const waitFor = async (fn, options = { timeout: 10 * 1000, delayInterval:
37
42
  }
38
43
  await delay(delayInterval, options);
39
44
  }
40
- throw createTimeoutError(options);
45
+ if (aborted) {
46
+ throw new AbortError();
47
+ }
48
+ else {
49
+ throw createTimeoutError(options);
50
+ }
41
51
  };
42
52
  export const waitForResolved = async (fn, options = { timeout: 10 * 1000, delayInterval: 50 }) => {
43
53
  const delayInterval = options.delayInterval || 50;
@@ -45,11 +55,16 @@ export const waitForResolved = async (fn, options = { timeout: 10 * 1000, delayI
45
55
  const startTime = Number(new Date());
46
56
  let stop = false;
47
57
  let lastError;
58
+ let aborted = false;
48
59
  const handleAbort = () => {
49
60
  stop = true;
61
+ aborted = true;
50
62
  options.signal?.removeEventListener("abort", handleAbort);
51
63
  };
52
64
  options.signal?.addEventListener("abort", handleAbort);
65
+ if (options?.signal?.aborted) {
66
+ handleAbort();
67
+ }
53
68
  // eslint-disable-next-line no-unmodified-loop-condition
54
69
  while (!stop && Number(new Date()) - startTime < timeout) {
55
70
  try {
@@ -67,6 +82,9 @@ export const waitForResolved = async (fn, options = { timeout: 10 * 1000, delayI
67
82
  }
68
83
  await delay(delayInterval, options);
69
84
  }
85
+ if (aborted) {
86
+ throw new AbortError();
87
+ }
70
88
  throw lastError || createTimeoutError(options);
71
89
  };
72
90
  //# sourceMappingURL=wait.js.map
package/dist/src/wait.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,62 +1,62 @@
1
1
  {
2
- "name": "@peerbit/time",
3
- "version": "2.0.7",
4
- "description": "Utility functions for time",
5
- "type": "module",
6
- "sideEffects": false,
7
- "types": "./dist/src/index.d.ts",
8
- "typesVersions": {
9
- "*": {
10
- "*": [
11
- "*",
12
- "dist/*",
13
- "dist/src/*",
14
- "dist/src/*/index"
15
- ],
16
- "src/*": [
17
- "*",
18
- "dist/*",
19
- "dist/src/*",
20
- "dist/src/*/index"
21
- ]
22
- }
23
- },
24
- "files": [
25
- "src",
26
- "dist",
27
- "!dist/test",
28
- "!**/*.tsbuildinfo"
29
- ],
30
- "exports": {
31
- ".": {
32
- "types": "./dist/src/index.d.ts",
33
- "import": "./dist/src/index.js"
34
- }
35
- },
36
- "eslintConfig": {
37
- "extends": "peerbit",
38
- "parserOptions": {
39
- "project": true,
40
- "sourceType": "module"
41
- },
42
- "ignorePatterns": [
43
- "!.aegir.js",
44
- "test/ts-use",
45
- "*.d.ts"
46
- ]
47
- },
48
- "browser": {
49
- "./dist/src/hrtime.js": "./dist/src/hrtime.browser.js"
50
- },
51
- "publishConfig": {
52
- "access": "public"
53
- },
54
- "scripts": {
55
- "clean": "aegir clean",
56
- "build": "aegir build --no-bundle",
57
- "test": "aegir test",
58
- "lint": "aegir lint"
59
- },
60
- "author": "dao.xyz",
61
- "license": "MIT"
2
+ "name": "@peerbit/time",
3
+ "version": "2.0.8-263159d",
4
+ "description": "Utility functions for time",
5
+ "type": "module",
6
+ "sideEffects": false,
7
+ "types": "./dist/src/index.d.ts",
8
+ "typesVersions": {
9
+ "*": {
10
+ "*": [
11
+ "*",
12
+ "dist/*",
13
+ "dist/src/*",
14
+ "dist/src/*/index"
15
+ ],
16
+ "src/*": [
17
+ "*",
18
+ "dist/*",
19
+ "dist/src/*",
20
+ "dist/src/*/index"
21
+ ]
22
+ }
23
+ },
24
+ "files": [
25
+ "src",
26
+ "dist",
27
+ "!dist/test",
28
+ "!**/*.tsbuildinfo"
29
+ ],
30
+ "exports": {
31
+ ".": {
32
+ "types": "./dist/src/index.d.ts",
33
+ "import": "./dist/src/index.js"
34
+ }
35
+ },
36
+ "eslintConfig": {
37
+ "extends": "peerbit",
38
+ "parserOptions": {
39
+ "project": true,
40
+ "sourceType": "module"
41
+ },
42
+ "ignorePatterns": [
43
+ "!.aegir.js",
44
+ "test/ts-use",
45
+ "*.d.ts"
46
+ ]
47
+ },
48
+ "browser": {
49
+ "./dist/src/hrtime.js": "./dist/src/hrtime.browser.js"
50
+ },
51
+ "publishConfig": {
52
+ "access": "public"
53
+ },
54
+ "scripts": {
55
+ "clean": "aegir clean",
56
+ "build": "aegir build --no-bundle",
57
+ "test": "aegir test",
58
+ "lint": "aegir lint"
59
+ },
60
+ "author": "dao.xyz",
61
+ "license": "MIT"
62
62
  }
package/src/wait.ts CHANGED
@@ -36,12 +36,17 @@ export const waitFor = async <T>(
36
36
  const startTime = Number(new Date());
37
37
  let stop = false;
38
38
 
39
+ let aborted = false;
39
40
  const handleAbort = () => {
40
41
  stop = true;
42
+ aborted = true;
41
43
  options.signal?.removeEventListener("abort", handleAbort);
42
44
  };
43
45
 
44
46
  options.signal?.addEventListener("abort", handleAbort);
47
+ if (options?.signal?.aborted) {
48
+ handleAbort();
49
+ }
45
50
 
46
51
  // eslint-disable-next-line no-unmodified-loop-condition
47
52
  while (!stop && Number(new Date()) - startTime < timeout) {
@@ -53,7 +58,11 @@ export const waitFor = async <T>(
53
58
 
54
59
  await delay(delayInterval, options);
55
60
  }
56
- throw createTimeoutError(options);
61
+ if (aborted) {
62
+ throw new AbortError();
63
+ } else {
64
+ throw createTimeoutError(options);
65
+ }
57
66
  };
58
67
 
59
68
  export const waitForResolved = async <T>(
@@ -72,12 +81,17 @@ export const waitForResolved = async <T>(
72
81
  let stop = false;
73
82
  let lastError: Error | undefined;
74
83
 
84
+ let aborted = false;
75
85
  const handleAbort = () => {
76
86
  stop = true;
87
+ aborted = true;
77
88
  options.signal?.removeEventListener("abort", handleAbort);
78
89
  };
79
90
 
80
91
  options.signal?.addEventListener("abort", handleAbort);
92
+ if (options?.signal?.aborted) {
93
+ handleAbort();
94
+ }
81
95
 
82
96
  // eslint-disable-next-line no-unmodified-loop-condition
83
97
  while (!stop && Number(new Date()) - startTime < timeout) {
@@ -95,5 +109,9 @@ export const waitForResolved = async <T>(
95
109
  await delay(delayInterval, options);
96
110
  }
97
111
 
112
+ if (aborted) {
113
+ throw new AbortError();
114
+ }
115
+
98
116
  throw lastError || createTimeoutError(options);
99
117
  };