@fedify/postgres 0.1.0-dev.3 → 0.1.0-dev.4

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 (4) hide show
  1. package/esm/src/mq.js +14 -10
  2. package/package.json +1 -1
  3. package/script/src/mq.js +14 -10
  4. package/types/src/mq.d.ts.map +1 -1
package/esm/src/mq.js CHANGED
@@ -62,9 +62,8 @@ export class PostgresMessageQueue {
62
62
  await this.initialize();
63
63
  const { signal } = options;
64
64
  const poll = async () => {
65
- if (signal?.aborted)
66
- return;
67
- const query = __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").bind(this) `
65
+ while (!signal?.aborted) {
66
+ const query = __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").bind(this) `
68
67
  DELETE FROM ${__classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").call(this, __classPrivateFieldGet(this, _PostgresMessageQueue_tableName, "f"))}
69
68
  WHERE id = (
70
69
  SELECT id
@@ -75,14 +74,19 @@ export class PostgresMessageQueue {
75
74
  )
76
75
  RETURNING message;
77
76
  `.execute();
78
- const cancel = query.cancel.bind(query);
79
- signal?.addEventListener("abort", cancel);
80
- for (const message of await query) {
81
- if (signal?.aborted)
82
- return;
83
- await handler(JSON.parse(message.message));
77
+ const cancel = query.cancel.bind(query);
78
+ signal?.addEventListener("abort", cancel);
79
+ let i = 0;
80
+ for (const message of await query) {
81
+ if (signal?.aborted)
82
+ return;
83
+ await handler(JSON.parse(message.message));
84
+ i++;
85
+ }
86
+ signal?.removeEventListener("abort", cancel);
87
+ if (i < 1)
88
+ break;
84
89
  }
85
- signal?.removeEventListener("abort", cancel);
86
90
  };
87
91
  const timeouts = new Set();
88
92
  const listen = await __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").listen(__classPrivateFieldGet(this, _PostgresMessageQueue_channelName, "f"), async (delay) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fedify/postgres",
3
- "version": "0.1.0-dev.3+bb96183e",
3
+ "version": "0.1.0-dev.4+d5239460",
4
4
  "description": "PostgreSQL drivers for Fedify",
5
5
  "keywords": [
6
6
  "fedify",
package/script/src/mq.js CHANGED
@@ -91,9 +91,8 @@ class PostgresMessageQueue {
91
91
  await this.initialize();
92
92
  const { signal } = options;
93
93
  const poll = async () => {
94
- if (signal?.aborted)
95
- return;
96
- const query = __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").bind(this) `
94
+ while (!signal?.aborted) {
95
+ const query = __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").bind(this) `
97
96
  DELETE FROM ${__classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").call(this, __classPrivateFieldGet(this, _PostgresMessageQueue_tableName, "f"))}
98
97
  WHERE id = (
99
98
  SELECT id
@@ -104,14 +103,19 @@ class PostgresMessageQueue {
104
103
  )
105
104
  RETURNING message;
106
105
  `.execute();
107
- const cancel = query.cancel.bind(query);
108
- signal?.addEventListener("abort", cancel);
109
- for (const message of await query) {
110
- if (signal?.aborted)
111
- return;
112
- await handler(JSON.parse(message.message));
106
+ const cancel = query.cancel.bind(query);
107
+ signal?.addEventListener("abort", cancel);
108
+ let i = 0;
109
+ for (const message of await query) {
110
+ if (signal?.aborted)
111
+ return;
112
+ await handler(JSON.parse(message.message));
113
+ i++;
114
+ }
115
+ signal?.removeEventListener("abort", cancel);
116
+ if (i < 1)
117
+ break;
113
118
  }
114
- signal?.removeEventListener("abort", cancel);
115
119
  };
116
120
  const timeouts = new Set();
117
121
  const listen = await __classPrivateFieldGet(this, _PostgresMessageQueue_sql, "f").listen(__classPrivateFieldGet(this, _PostgresMessageQueue_channelName, "f"), async (delay) => {
package/types/src/mq.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mq.d.ts","sourceRoot":"","sources":["../../src/src/mq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EACV,YAAY,EACZ,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAGpC;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;CAC1E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAqB,YAAW,YAAY;;gBAUrD,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACZ,OAAO,GAAE,2BAAgC;IAWrC,OAAO,CAEX,OAAO,EAAE,GAAG,EACZ,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;IAUV,MAAM,CAEV,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/C,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,IAAI,CAAC;IA0DhB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}
1
+ {"version":3,"file":"mq.d.ts","sourceRoot":"","sources":["../../src/src/mq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EACV,YAAY,EACZ,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAGpC;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;CAC1E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAqB,YAAW,YAAY;;gBAUrD,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACZ,OAAO,GAAE,2BAAgC;IAWrC,OAAO,CAEX,OAAO,EAAE,GAAG,EACZ,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;IAUV,MAAM,CAEV,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/C,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,IAAI,CAAC;IA8DhB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}