@social-mail/social-mail-web-server 1.4.778 → 1.4.780

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/dist/WebServer.js CHANGED
@@ -137,7 +137,7 @@ export default class WebServer {
137
137
  }
138
138
  async seed() {
139
139
  await seed();
140
- await globalServices.resolve(WorkflowContext).storage.seed();
140
+ await globalServices.resolve(WorkflowContext).storage.seed(globalEnv.version);
141
141
  }
142
142
  registerRoutes(server) {
143
143
  // do nothing
@@ -1 +1 @@
1
- {"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../src/WebServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../src/WebServer.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  export declare const globalEnv: {
2
2
  protocol: any;
3
+ version: any;
3
4
  host: string;
4
5
  cdn: string;
5
6
  path: string;
@@ -1 +1 @@
1
- {"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;kBAmBmC,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;CAmBhG,CAAC;AAWF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}
1
+ {"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;kBAoBmC,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;CAmBhG,CAAC;AAWF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}
@@ -1,4 +1,10 @@
1
+ import { readFileSync } from "node:fs";
1
2
  import { availableParallelism } from "node:os";
3
+ import { join } from "node:path";
4
+ import { fileURLToPath } from "node:url";
5
+ const packageJsonPath = join(fileURLToPath(import.meta.url), "../../../package.json");
6
+ const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
7
+ const { version } = packageJson;
2
8
  const isTestMode = (process.env.LOGGER_SERVER_TEST_MODE ?? "false") === "true";
3
9
  let port = Number(process.env.PORT ?? 8080);
4
10
  if (Number.isNaN(port)) {
@@ -6,6 +12,7 @@ if (Number.isNaN(port)) {
6
12
  }
7
13
  export const globalEnv = {
8
14
  protocol: void 0,
15
+ version,
9
16
  host: process.env.SOCIAL_MAIL_HOST,
10
17
  cdn: process.env.SOCIAL_MAIL_CDN,
11
18
  path: process.env.SOCIAL_MAIL_PATH || "/",
@@ -1 +1 @@
1
- {"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAG/C,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,KAAK,MAAM,CAAC;AAE/E,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAC5C,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IACrB,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAyB,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAClC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAChC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,GAAG;IACzC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IACrD,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAC9D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IACvD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,aAAa;IACnD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;IAC7C,IAAI;IACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;IAC3C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;IACxD,UAAU,EAAE,KAAK;IACjB,UAAU;IACV,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAC9D,GAAG,EAAE;QACD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,mBAAmB;QAC5E,IAAI,EAAE;YACF,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAA6C;YACrF,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;YAChD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;YACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;SACxD;KACJ;IACD,EAAE,EAAE;QACA,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,aAAa;QACjE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,WAAW;QACvD,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC;QACxD,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC;QAC5D,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,UAAU;QACtD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,SAAS;KAChE;IACD,OAAO,EAAE,UAAU;QACf,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B;YACtC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;YACjD,CAAC,CAAC,oBAAoB,EAAE,CAAC;CACpC,CAAC;AAEF,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC5E,CAAC;AAED,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC;AACxB,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;IACnB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,EAAE;IACrB,CAAC,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG;IAC3B,CAAC,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC"}
1
+ {"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"MailboxContactEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAGzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAIlG,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAGjF,OAAO,CAAC,GAAG,CAAsB;IAEjC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAazE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAIjE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAS7E,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC;IAM1D,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;CA+C/E"}
1
+ {"version":3,"file":"MailboxContactEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAGzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAIlG,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAGjF,OAAO,CAAC,GAAG,CAAsB;IAEjC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;IAazE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAIjE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAS7E,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC;IAM1D,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;CAoC/E"}
@@ -42,8 +42,7 @@ export default class MailboxContactEvents extends AuthenticatedEvents {
42
42
  }
43
43
  async afterUpdate(entity, entry) {
44
44
  // if blocked was changed
45
- const { mailboxID, blocked, autoClose } = entity;
46
- let { openThreads, totalThreads } = entity;
45
+ const { mailboxID, blocked, autoClose, emailAddressID, openThreads } = entity;
47
46
  const db = ServiceProvider.resolve(this, SocialMailContext);
48
47
  if (entry.isUpdated("autoClose") || entry.isUpdated("blocked")) {
49
48
  if (autoClose || blocked) {
@@ -59,23 +58,15 @@ export default class MailboxContactEvents extends AuthenticatedEvents {
59
58
  }
60
59
  else {
61
60
  // we need to recalculate
62
- const t = await db.emails.where(entity, (p) => (x) => x.threadContacts
63
- .some((tc) => tc.mailboxID === p.mailboxID
64
- && tc.emailAddressID === p.emailAddressID)
65
- && x.threadID === x.emailID)
61
+ const all = await db.emails
62
+ .where(entity, (p) => (x) => x.threadContacts.some((t) => t.mailboxID === p.mailboxID
63
+ && t.emailAddressID === p.emailAddressID)
64
+ && x.threadID === null)
66
65
  .sum(void 0, (p) => (x) => ({
67
- openThreads: x.closed === null ? 1 : 0,
68
- totalThreads: 1
69
- }));
70
- if (t) {
71
- openThreads = t.openThreads;
72
- totalThreads = t.totalThreads;
73
- }
74
- await db.mailboxes.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID)
75
- .update({ openThreads, totalThreads }, (p) => (x) => ({
76
- openThreads: Sql.math.max(0, x.openThreads + Sql.cast.asInteger(p.openThreads)),
77
- totalThreads: Sql.math.max(0, x.totalThreads + Sql.cast.asInteger(p.totalThreads))
66
+ totalThreads: 1,
67
+ openThreads: x.lastReplyID === null ? 1 : 0
78
68
  }));
69
+ await db.mailboxContacts.statements.update(all, { mailboxID, emailAddressID });
79
70
  }
80
71
  }
81
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MailboxContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MailboxContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"AAWA,wBAA8B,IAAI,kBA4BjC"}
1
+ {"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"AAWA,wBAA8B,IAAI,kBA8BjC"}
@@ -62,12 +62,13 @@ export default async function seed() {
62
62
  try {
63
63
  // making sure multiple workers don't interfere
64
64
  const fl = __addDisposableResource(env_1, await LockFile.lock(`seed-lock-${globalEnv.serverID}.lock`), false);
65
+ const migrationConfig = { version: globalEnv.version };
65
66
  const lc = scope.resolve(DbLockContext);
66
67
  await lc.connection.ensureDatabase();
67
- await lc.connection.automaticMigrations().migrate(lc);
68
+ await lc.connection.automaticMigrations().migrate(lc, migrationConfig);
68
69
  const context = scope.resolve(SocialMailContext);
69
70
  await context.connection.ensureDatabase();
70
- await context.connection.automaticMigrations().migrate(context);
71
+ await context.connection.automaticMigrations().migrate(context, migrationConfig);
71
72
  context.verifyFilters = false;
72
73
  context.raiseEvents = false;
73
74
  await seedAdminUser(scope, context);
@@ -1 +1 @@
1
- {"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,IAAI;IAE9B,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,CAAC;;;YAED,+CAA+C;YAC/C,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,QAAQ,OAAO,CAAC,QAAA,CAAC;YAEvE,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxC,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACrC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEtD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACjD,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC1C,MAAM,OAAO,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAGhE,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;YAC9B,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAG5B,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACpC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC5B,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;;;;;;;;;KAC3B;YAAS,CAAC;QACP,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,IAAI;IAE9B,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,CAAC;;;YAED,+CAA+C;YAC/C,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,QAAQ,OAAO,CAAC,QAAA,CAAC;YAEvE,MAAM,eAAe,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;YAEvD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxC,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACrC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;YAEvE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACjD,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC1C,MAAM,OAAO,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YAGjF,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;YAC9B,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAG5B,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACpC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC5B,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;;;;;;;;;KAC3B;YAAS,CAAC;QACP,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;AACL,CAAC"}
@@ -1,9 +1,9 @@
1
1
  export default class LockFile implements Disposable {
2
2
  private readonly lockFile;
3
- private readonly fd;
4
3
  static lock(someKey: string, timeout?: number): Promise<LockFile>;
5
4
  timer: any;
6
- constructor(lockFile: any, fd: any);
5
+ fd: any;
6
+ constructor(lockFile: any);
7
7
  [Symbol.dispose](): void;
8
8
  }
9
9
  //# sourceMappingURL=LockFile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"LockFile.d.ts","sourceRoot":"","sources":["../../../src/server/storage/LockFile.ts"],"names":[],"mappings":"AAyBA,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,UAAU;IAyCnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;WAvC7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,SAAY;IAqCtD,KAAK,EAAE,GAAG,CAAC;gBAEkB,QAAQ,KAAA,EAAmB,EAAE,KAAA;IAU1D,CAAC,MAAM,CAAC,OAAO,CAAC;CAWnB"}
1
+ {"version":3,"file":"LockFile.d.ts","sourceRoot":"","sources":["../../../src/server/storage/LockFile.ts"],"names":[],"mappings":"AAyBA,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,UAAU;IAyCnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;WAvCxB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,SAAY;IAoCtD,KAAK,EAAE,GAAG,CAAC;IACX,EAAE,EAAE,GAAG,CAAC;gBAEqB,QAAQ,KAAA;IAerC,CAAC,MAAM,CAAC,OAAO,CAAC;CAWnB"}
@@ -1,5 +1,5 @@
1
1
  import { join } from "node:path";
2
- import { existsSync, mkdirSync, openSync, constants, writeSync, closeSync, unlinkSync, statSync } from "node:fs";
2
+ import { existsSync, mkdirSync, openSync, constants, writeSync, closeSync, unlinkSync, statSync, fdatasyncSync } from "node:fs";
3
3
  import { createHash } from "node:crypto";
4
4
  import * as os from "node:os";
5
5
  import sleep from "../../common/sleep.js";
@@ -19,38 +19,41 @@ export default class LockFile {
19
19
  const sha256 = createHash("sha256");
20
20
  const hash = sha256.update(someKey).digest("hex");
21
21
  const lockFile = join(lockFolder, hash + ".lock");
22
- const till = Date.now() + timeout;
23
- while (Date.now() < till) {
22
+ let now = Date.now();
23
+ const till = now + timeout;
24
+ do {
24
25
  try {
25
26
  // check if it exists..
26
27
  if (!existsSync(lockFile)) {
27
28
  // create and return..
28
- const fd = openSync(lockFile, "wx", openMode);
29
- writeSync(fd, "1");
30
- return new LockFile(lockFile, fd);
29
+ return new LockFile(lockFile);
31
30
  }
32
31
  const stat = statSync(lockFile);
33
- const diff = Date.now() - stat.mtimeMs;
34
- if (diff > 30000) {
35
- // most likely this is dead...
32
+ const past = now - 15000;
33
+ if (stat.mtimeMs < past) {
34
+ // it is dead...
36
35
  unlinkSync(lockFile);
37
- continue;
38
36
  }
39
37
  }
40
38
  catch (error) {
41
39
  // do nothing
42
- // console.error(error);
40
+ console.error(error);
43
41
  }
44
42
  await sleep(3000);
45
- }
43
+ now = Date.now();
44
+ } while (now < till);
46
45
  throw new Error("Could not acquire lock");
47
46
  }
48
- constructor(lockFile, fd) {
47
+ constructor(lockFile) {
49
48
  this.lockFile = lockFile;
50
- this.fd = fd;
49
+ const fd = this.fd = openSync(lockFile, "wx", openMode);
50
+ let n = 1;
51
+ writeSync(fd, (n++) + "");
52
+ fdatasyncSync(fd);
51
53
  this.timer = setInterval(() => {
52
54
  try {
53
- writeSync(fd, "1");
55
+ writeSync(fd, (n++) + "");
56
+ fdatasyncSync(fd);
54
57
  }
55
58
  catch {
56
59
  // do nothing
@@ -1 +1 @@
1
- {"version":3,"file":"LockFile.js","sourceRoot":"","sources":["../../../src/server/storage/LockFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LockFile.js","sourceRoot":"","sources":["../../../src/server/storage/LockFile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAChI,OAAO,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;AAE/D,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;IAC1B,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,MAAM,OAAO,GAAG,EAAE,GAAC,OAAO,CAAC;AAC3B,MAAM,KAAK,GAAG,EAAE,GAAC,OAAO,CAAC;AAEzB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAE/C,sCAAsC;AACtC,MAAM,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,OAAO,GAAG,CAAC,GAAG,KAAK;QAClD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;QAElD,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,GAAG,GAAG,OAAO,CAAC;QAG3B,GAAG,CAAC;YAEA,IAAI,CAAC;gBACD,uBAAuB;gBACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACxB,sBAAsB;oBACtB,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAClC,CAAC;gBAED,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAChC,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;gBACzB,IAAG,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,CAAC;oBACrB,gBAAgB;oBAChB,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACzB,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAC,CAAC;gBACZ,aAAa;gBACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAClB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,CAAC,QAAM,GAAG,GAAG,IAAI,EAAE;QAEnB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC;IAKD,YAA6B,QAAQ;QAAR,aAAQ,GAAR,QAAQ,CAAA;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAE,CAAC;QAC3B,aAAa,CAAC,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC;gBACD,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAE,CAAC;gBAC3B,aAAa,CAAC,EAAE,CAAC,CAAC;YACtB,CAAC;YAAC,MAAM,CAAC;gBACL,aAAa;YACjB,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;IAED,CAAC,MAAM,CAAC,OAAO,CAAC;QACZ,IAAI,CAAC;YACD,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,kBAAkB;YAClB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;CAEJ"}
@@ -1,2 +1,2 @@
1
- export default function (): Promise<[void, void]>;
1
+ export default function (): Promise<void>;
2
2
  //# sourceMappingURL=lock-file-test.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"lock-file-test.d.ts","sourceRoot":"","sources":["../../../../src/tests/core/lock-file/lock-file-test.ts"],"names":[],"mappings":"AA4BA,MAAM,CAAC,OAAO,oCAKb"}
1
+ {"version":3,"file":"lock-file-test.d.ts","sourceRoot":"","sources":["../../../../src/tests/core/lock-file/lock-file-test.ts"],"names":[],"mappings":"AAqCA,0CAYC"}
@@ -45,9 +45,11 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
45
45
  var e = new Error(message);
46
46
  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
47
47
  });
48
+ /* eslint-disable no-console */
48
49
  import assert from "assert";
49
50
  import sleep from "../../../common/sleep.js";
50
51
  import LockFile from "../../../server/storage/LockFile.js";
52
+ import { closeSync } from "fs";
51
53
  Symbol.dispose ??= Symbol("dispose");
52
54
  Symbol.asyncDispose ??= Symbol("asyncDispose");
53
55
  let v = 0;
@@ -69,6 +71,12 @@ const lock1 = async () => {
69
71
  __disposeResources(env_1);
70
72
  }
71
73
  };
74
+ const deadLock = async () => {
75
+ const l = await LockFile.lock("a1");
76
+ closeSync(l.fd);
77
+ l.fd = null;
78
+ clearInterval(l.timer);
79
+ };
72
80
  const lock2 = async () => {
73
81
  const env_2 = { stack: [], error: void 0, hasError: false };
74
82
  try {
@@ -88,10 +96,15 @@ const lock2 = async () => {
88
96
  __disposeResources(env_2);
89
97
  }
90
98
  };
91
- export default function () {
92
- return Promise.all([
99
+ export default async function () {
100
+ await Promise.all([
93
101
  lock1(),
94
102
  lock2()
95
103
  ]);
104
+ console.log(`Trying Dead Lock`);
105
+ await Promise.all([
106
+ deadLock(),
107
+ lock2()
108
+ ]);
96
109
  }
97
110
  //# sourceMappingURL=lock-file-test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lock-file-test.js","sourceRoot":"","sources":["../../../../src/tests/core/lock-file/lock-file-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,QAAQ,MAAM,qCAAqC,CAAC;AAE1D,MAAc,CAAC,OAAO,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAc,CAAC,YAAY,KAAK,MAAM,CAAC,cAAc,CAAC,CAAC;AAExD,IAAI,CAAC,GAAG,CAAC,CAAC;AAEV,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;;;QACrB,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAA,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC;QACN,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;;;;;;;;;CACnC,CAAC;AAEF,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;;;QACrB,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAA,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC;QACN,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;;;;;;;;;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO;IACV,OAAO,OAAO,CAAC,GAAG,CAAC;QACf,KAAK,EAAE;QACP,KAAK,EAAE;KACV,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"lock-file-test.js","sourceRoot":"","sources":["../../../../src/tests/core/lock-file/lock-file-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,QAAQ,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE9B,MAAc,CAAC,OAAO,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAc,CAAC,YAAY,KAAK,MAAM,CAAC,cAAc,CAAC,CAAC;AAExD,IAAI,CAAC,GAAG,CAAC,CAAC;AAEV,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;;;QACrB,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAA,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC;QACN,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;;;;;;;;;CACnC,CAAC;AAEF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;IACxB,MAAM,CAAC,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC;IACZ,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;;;QACrB,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAA,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC;QACN,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;;;;;;;;;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK;IAChB,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,KAAK,EAAE;QACP,KAAK,EAAE;KACV,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEhC,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,QAAQ,EAAE;QACV,KAAK,EAAE;KACV,CAAC,CAAC;AACP,CAAC"}