@dosgato/api 0.0.19 → 0.0.21

package/dist/page/page.service.js

@@ -1,8 +1,8 @@
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
 import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { nanoid } from 'nanoid';
-import { eachConcurrent, filterAsync, intersect, isNotNull, keyby, mapConcurrent, someAsync, stringify, unique } from 'txstate-utils';
-import { VersionedService, templateRegistry, DosGatoService, PageResponse, PagesResponse, createPage, getPages, movePages, deletePages, renamePage, TemplateService, getPageIndexes, undeletePages, validatePage, DeletedFilter, copyPages, TemplateType, migratePage, PagetreeServiceInternal, collectTemplates, TemplateServiceInternal, SiteServiceInternal, PagetreeType } from '../internal.js';
+import db from 'mysql2-async/db';
+import { filterAsync, intersect, isNotNull, keyby, someAsync, stringify, unique } from 'txstate-utils';
+import { VersionedService, templateRegistry, DosGatoService, PageResponse, PagesResponse, createPage, getPages, movePages, deletePages, renamePage, TemplateService, getPageIndexes, undeletePages, validatePage, DeletedFilter, copyPages, TemplateType, migratePage, PagetreeServiceInternal, collectTemplates, TemplateServiceInternal, SiteServiceInternal, PagetreeType, DeleteState, publishPageDeletions } from '../internal.js';
 const pagesByInternalIdLoader = new PrimaryKeyLoader({
     fetch: async (internalIds) => {
         return await getPages({ internalIds, deleted: DeletedFilter.SHOW });
@@ -58,8 +58,8 @@ export class PageServiceInternal extends BaseService {
         if (filter.linkIdsReferenced?.length) {
             const searchRule = { indexName: 'link_page', in: filter.linkIdsReferenced.map(linkId => (stringify({ linkId }))) };
             const [dataIdsLatest, dataIdsPublished] = await Promise.all([
-                this.svc(VersionedService).find([searchRule], 'latest'),
-                this.svc(VersionedService).find([searchRule], 'published')
+                this.svc(VersionedService).find([searchRule], 'page'),
+                this.svc(VersionedService).find([searchRule], 'page', 'published')
             ]);
             const dataIds = unique([...dataIdsLatest, ...dataIdsPublished]);
             if (filter.ids?.length)
@@ -90,8 +90,8 @@ export class PageServiceInternal extends BaseService {
     async findByTemplate(key, filter) {
         const searchRule = { indexName: 'template', equal: key };
         const [dataIdsLatest, dataIdsPublished] = await Promise.all([
-            this.svc(VersionedService).find([searchRule], 'latest'),
-            this.svc(VersionedService).find([searchRule], 'published')
+            this.svc(VersionedService).find([searchRule], 'page'),
+            this.svc(VersionedService).find([searchRule], 'page', 'published')
         ]);
         let dataIds = unique([...dataIdsLatest, ...dataIdsPublished]);
         if (!dataIds.length)
@@ -139,6 +139,10 @@ export class PageServiceInternal extends BaseService {
         }, toSchemaVersion);
     }
     async processFilters(filter) {
+        if (filter.legacyIds?.length) {
+            const pages = await this.svc(VersionedService).find([{ indexName: 'legacyId', in: filter.legacyIds }], 'page', filter.published ? 'published' : 'latest');
+            filter.ids = intersect({ skipEmpty: true }, filter.ids, pages);
+        }
         if (filter.referencedByPageIds?.length) {
             // TODO: refactor this to use VersionedService indexes instead of rescanning the data
             const verService = this.svc(VersionedService);
@@ -195,7 +199,7 @@ export class PageService extends DosGatoService {
         return await this.removeUnauthorized(await this.raw.findByInternalId(internalId));
     }
     async findByPagetreeId(id, filter) {
-        return await this.removeUnauthorized(await this.raw.findByPagetreeId(id));
+        return await this.removeUnauthorized(await this.raw.findByPagetreeId(id, filter));
     }
     async findByTemplate(key, filter) {
         return await this.removeUnauthorized(await this.raw.findByTemplate(key, filter));
@@ -241,26 +245,61 @@ export class PageService extends DosGatoService {
     async mayViewManagerUI() {
         return (await this.currentPageRules()).some(r => r.grants.viewForEdit);
     }
+    async isInArchive(page) {
+        const pagetree = await this.svc(PagetreeServiceInternal).findById(page.pagetreeId);
+        return pagetree.type === PagetreeType.ARCHIVE;
+    }
+    async isPublished(page) {
+        const tag = await this.svc(VersionedService).getTag(page.dataId, 'published');
+        return !!tag;
+    }
     // authenticated user may create pages underneath given page
     async mayCreate(page) {
+        if (await this.isInArchive(page))
+            return false;
         return await this.havePagePerm(page, 'create');
     }
     async mayUpdate(page) {
+        if (await this.isInArchive(page))
+            return false;
         return await this.havePagePerm(page, 'update');
     }
-    async mayPublish(page) {
+    async mayPublish(page, parentBeingPublished) {
+        if (await this.isInArchive(page))
+            return false;
+        if (page.parentInternalId && !parentBeingPublished) {
+            const parent = await this.raw.findByInternalId(page.parentInternalId);
+            if (!await this.isPublished(parent))
+                return false;
+        }
         return await this.havePagePerm(page, 'publish');
     }
     async mayUnpublish(page) {
+        if (!page.parentInternalId)
+            return false; // root page of a site/pagetree cannot be unpublished - the site launch should be disabled instead
+        if (await this.isInArchive(page))
+            return false;
+        if (!await this.isPublished(page))
+            return false;
         return await this.havePagePerm(page, 'unpublish');
     }
     async mayMove(page) {
+        if (!page.parentInternalId)
+            return false; // root page of a site/pagetree cannot be moved
+        if (await this.isInArchive(page))
+            return false;
         return await this.havePagePerm(page, 'move');
     }
     async mayDelete(page) {
+        if (!page.parentInternalId)
+            return false; // root page of a site/pagetree cannot be deleted
+        if (await this.isInArchive(page))
+            return false;
         return await this.havePagePerm(page, 'delete');
     }
     async mayUndelete(page) {
+        if (await this.isInArchive(page))
+            return false;
         return await this.havePagePerm(page, 'undelete');
     }
     /**
@@ -282,8 +321,8 @@ export class PageService extends DosGatoService {
             throw new Error('Current user is not permitted to copy pages to this location.');
         }
         // Is this page allowed to be copied here?
-        const pageData = (await mapConcurrent(pages, async (page) => await this.svc(VersionedService).get(page.id))).filter(isNotNull);
-        await eachConcurrent(pageData, async (d) => await this.validatePageTemplates(parent, d.data, true));
+        const pageData = (await Promise.all(pages.map(async (page) => await this.svc(VersionedService).get(page.id)))).filter(isNotNull);
+        await Promise.all(pageData.map(async (d) => await this.validatePageTemplates(parent, d.data, true)));
         const newPage = await copyPages(this.svc(VersionedService), this.login, pages, parent, aboveTarget, includeChildren);
         return new PageResponse({ success: true, page: newPage });
     }
@@ -332,14 +371,13 @@ export class PageService extends DosGatoService {
         await this.validatePageTemplates(parent, data, true);
         const pagetree = (await this.svc(PagetreeServiceInternal).findById(parent.pagetreeId));
         const site = (await this.svc(SiteServiceInternal).findById(pagetree.siteId));
-        const linkId = nanoid(10);
-        const response = await this.validatePageData(data, site, pagetree, parent, name, linkId);
+        const response = await this.validatePageData(data, site, pagetree, parent, name);
         const pages = await this.raw.getPageChildren(parent, false);
         if (pages.some(p => p.name === name)) {
             response.addMessage('A page with this name already exists', 'name');
         }
         if (!validateOnly && response.success) {
-            response.page = await createPage(this.svc(VersionedService), this.login, parent, aboveTarget, name, data, linkId);
+            response.page = await createPage(this.svc(VersionedService), this.login, parent, aboveTarget, name, data);
             this.loaders.clear();
         }
         return response;
@@ -396,7 +434,7 @@ export class PageService extends DosGatoService {
         }
         const currentUser = await this.currentUser();
         try {
-            await deletePages(pages, currentUser.internalId);
+            await deletePages(this.svc(VersionedService), pages, currentUser.internalId);
             this.loaders.clear();
             const updated = await this.raw.findByIds(dataIds);
             return new PagesResponse({ success: true, pages: updated });
@@ -406,6 +444,17 @@ export class PageService extends DosGatoService {
             throw new Error('An unknown error ocurred while trying to delete a page.');
         }
     }
+    async publishPageDeletions(dataIds) {
+        const pages = (await Promise.all(dataIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull).filter(p => p.deleteState !== DeleteState.NOTDELETED);
+        if (await someAsync(pages, async (page) => !(await this.mayDelete(page)))) {
+            throw new Error('Current user is not permitted to delete one or more pages');
+        }
+        const currentUser = await this.currentUser();
+        await publishPageDeletions(pages, currentUser.internalId);
+        this.loaders.clear();
+        const updated = await this.raw.findByIds(pages.map(p => p.id));
+        return new PagesResponse({ success: true, pages: updated });
+    }
     async undeletePages(dataIds, includeChildren) {
         let pages = (await Promise.all(dataIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);
         if (includeChildren) {
@@ -432,12 +481,15 @@ export class PageService extends DosGatoService {
             const children = (await Promise.all(pages.map(async (page) => await this.getPageChildren(page, true)))).flat();
             pages = [...pages, ...children];
         }
-        if (await someAsync(pages, async (page) => !(await this.mayPublish(page)))) {
+        if (await someAsync(pages, async (page) => !(await this.mayPublish(page, true)))) {
             throw new Error('Current user is not permitted to publish one or more pages');
         }
         pages = pages.filter(p => !p.deleted);
         try {
-            await eachConcurrent(pages.map(p => p.dataId), async (dataId) => await this.svc(VersionedService).tag(dataId, 'published', undefined, this.login));
+            await db.transaction(async (db) => {
+                for (const p of pages)
+                    await this.svc(VersionedService).tag(p.dataId, 'published', undefined, this.login);
+            });
             this.loaders.clear();
             return new ValidatedResponse({ success: true });
         }
@@ -454,7 +506,10 @@ export class PageService extends DosGatoService {
             throw new Error('Current user is not permitted to unpublish one or more pages');
         }
         try {
-            await eachConcurrent(pages.map(p => p.id), async (dataId) => await this.svc(VersionedService).removeTag(dataId, 'published'));
+            await db.transaction(async (db) => {
+                for (const p of pages)
+                    await this.svc(VersionedService).removeTag(p.dataId, 'published');
+            });
             this.loaders.clear();
             return new ValidatedResponse({ success: true });
         }

package/dist/page/page.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.service.js","sourceRoot":"","sources":["../../src/page/page.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"page.service.js","sourceRoot":"","sources":["../../src/page/page.service.ts"],"names":[],"mappings":"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"}

package/dist/pagetree/pagetree.database.js

@@ -33,7 +33,7 @@ export async function getPagetreesBySite(siteIds, filter) {
     const { binds, where } = processFilters(filter);
     where.push(`pagetrees.siteID IN (${db.in(binds, siteIds)})`);
     const pagetrees = await db.getall(`SELECT * from pagetrees
-                     WHERE (${where.join(') AND (')})`, binds);
+                     WHERE (${where.join(') AND (')}) ORDER BY type`, binds);
     return pagetrees.map(p => new Pagetree(p));
 }
 export async function getPagetreesByTemplate(templateIds, direct) {

package/dist/pagetree/pagetree.database.js.map

@@ -1 +1 @@
-{"version":3,"file":"pagetree.database.js","sourceRoot":"","sources":["../../src/pagetree/pagetree.database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pagetree.database.js","sourceRoot":"","sources":["../../src/pagetree/pagetree.database.ts"],"names":[],"mappings":"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"}

package/dist/scalars/urlsafestring.js

@@ -1,6 +1,6 @@
 import { GraphQLScalarType, Kind } from 'graphql';
 export function makeSafe(str) {
-    return str.normalize('NFKD').toLocaleLowerCase().replace(/[^.a-z0-9-]/g, '-').replace(/-+/g, '-').replace(/^-/, '').replace(/-$/, '');
+    return str.normalize('NFKD').toLocaleLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-').replace(/^-/, '').replace(/-$/, '');
 }
 export class UrlSafeString extends String {
 }

package/dist/scalars/urlsafestring.js.map

@@ -1 +1 @@
-{"version":3,"file":"urlsafestring.js","sourceRoot":"","sources":["../../src/scalars/urlsafestring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEjD,MAAM,UAAU,QAAQ,CAAE,GAAW;IACnC,OAAO,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AACvI,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,MAAM;CAAG;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,CAAC;IACvD,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,mEAAmE;IAChF,SAAS,CAAE,KAAa;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;IACD,UAAU,CAAE,KAAa;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;IACD,YAAY,CAAE,GAAQ;QACpB,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"urlsafestring.js","sourceRoot":"","sources":["../../src/scalars/urlsafestring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEjD,MAAM,UAAU,QAAQ,CAAE,GAAW;IACnC,OAAO,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AACtI,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,MAAM;CAAG;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,CAAC;IACvD,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,mEAAmE;IAChF,SAAS,CAAE,KAAa;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;IACD,UAAU,CAAE,KAAa;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;IACD,YAAY,CAAE,GAAQ;QACpB,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC;CACF,CAAC,CAAA"}

package/dist/util/authservice.d.ts

@@ -1,4 +1,4 @@
-import { AuthorizedService } from '@txstate-mws/graphql-server';
+import { AuthorizedService, Context } from '@txstate-mws/graphql-server';
 import { Asset, AssetFolder, Data, DataFolder, Page, Site, Template, AssetRuleGrants, DataRuleGrants, GlobalRuleGrants, PageRuleGrants, SiteRuleGrants, TemplateRuleGrants, DataRoot, Group } from '../internal.js';
 export declare abstract class DosGatoService<ObjType, RedactedType = ObjType> extends AuthorizedService<{
     sub: string;
@@ -26,3 +26,4 @@ export declare abstract class DosGatoService<ObjType, RedactedType = ObjType> ex
     protected currentTemplateRules(): Promise<import("../internal.js").TemplateRule[]>;
     protected haveTemplatePerm(template: Template, grant: keyof TemplateRuleGrants): Promise<boolean>;
 }
+export declare function getEnabledUser(ctx: Context): Promise<import("../internal.js").User>;

package/dist/util/authservice.js

@@ -1,4 +1,4 @@
-import { AuthorizedService } from '@txstate-mws/graphql-server';
+import { AuthError, AuthorizedService } from '@txstate-mws/graphql-server';
 import { filterAsync, keyby } from 'txstate-utils';
 import { AssetRuleService, DataRuleService, GlobalRuleService, PageRuleService, SiteRuleService, TemplateRuleService, RoleServiceInternal, SiteRuleServiceInternal, PageRuleServiceInternal, AssetRuleServiceInternal, DataRuleServiceInternal, GlobalRuleServiceInternal, GroupServiceInternal, UserServiceInternal, TemplateRuleServiceInternal } from '../internal.js';
 export class DosGatoService extends AuthorizedService {
@@ -128,4 +128,13 @@ export class DosGatoService extends AuthorizedService {
         return applicable.some(r => r.grants[grant]);
     }
 }
+export async function getEnabledUser(ctx) {
+    await ctx.waitForAuth();
+    if (!ctx.auth?.sub)
+        throw new AuthError();
+    const user = await ctx.svc(UserServiceInternal).findById(ctx.auth.sub);
+    if (!user || user.disabled)
+        throw new AuthError();
+    return user;
+}
 //# sourceMappingURL=authservice.js.map

package/dist/util/authservice.js.map

@@ -1 +1 @@
-{"version":3,"file":"authservice.js","sourceRoot":"","sources":["../../src/util/authservice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authservice.js","sourceRoot":"","sources":["../../src/util/authservice.ts"],"names":[],"mappings":"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"}

package/dist/util/index.d.ts

@@ -3,6 +3,7 @@ export * from './indexing.js';
 export * from './migrations.js';
 export * from './registry.js';
 export * from './rules.js';
+export * from './scheduler.js';
 export * from './mutationlogger.js';
 export * from './dates.js';
 export * from './login.js';
@@ -10,3 +11,4 @@ export declare function normalizePath(path: string): string;
 export declare function appendPath(a: string, b: string): string;
 export declare function popPath(path: string): string;
 export declare function basename(p: string): string;
+export declare function numerate(name: string): string;

package/dist/util/index.js

@@ -5,6 +5,7 @@ export * from './indexing.js';
 export * from './migrations.js';
 export * from './registry.js';
 export * from './rules.js';
+export * from './scheduler.js';
 export * from './mutationlogger.js';
 export * from './dates.js';
 export * from './login.js';
@@ -21,4 +22,9 @@ export function popPath(path) {
 export function basename(p) {
     return path.basename(p);
 }
+export function numerate(name) {
+    if (/-\d*$/.test(name))
+        return name.replace(/-(\d*)$/, (_, num) => `-${String(Number(num) + 1).padStart(num.length, '0')}`);
+    return name + '-1';
+}
 //# sourceMappingURL=index.js.map

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAE1B,MAAM,UAAU,aAAa,CAAE,IAAY;IACzC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACxF,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,CAAS,EAAE,CAAS;IAC9C,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAA;AAC1C,CAAC;AAED,MAAM,UAAU,OAAO,CAAE,IAAY;IACnC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AACxE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAE,CAAS;IACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAE1B,MAAM,UAAU,aAAa,CAAE,IAAY;IACzC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACxF,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,CAAS,EAAE,CAAS;IAC9C,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAA;AAC1C,CAAC;AAED,MAAM,UAAU,OAAO,CAAE,IAAY;IACnC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AACxE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAE,CAAS;IACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;AACzB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAE,IAAY;IACpC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;IAC3H,OAAO,IAAI,GAAG,IAAI,CAAA;AACpB,CAAC"}

package/dist/util/mutationlogger.js

@@ -1,12 +1,11 @@
 import db from 'mysql2-async/db';
 import { stringify } from 'txstate-utils';
-// TODO: do not log mutations that failed validation
 export async function logMutation(queryTime, operationName, query, auth, variables, data, errors) {
-    if (!variables.validateOnly && query.trimStart().startsWith('mutation')) {
+    if (!variables?.validateOnly && query.trimStart().startsWith('mutation') && data.success) {
         await db.insert(`
       INSERT INTO mutationlog (userId, query, mutation, variables)
       SELECT id, ?, ?, ? FROM users WHERE login=?
-    `, [query, operationName, stringify({ ...variables, data: undefined }), auth.sub]);
+    `, [query, operationName, stringify({ ...variables, data: 'redacted' }), auth.sub]);
     }
 }
 //# sourceMappingURL=mutationlogger.js.map

package/dist/util/mutationlogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutationlogger.js","sourceRoot":"","sources":["../../src/util/mutationlogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAEzC,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAE,SAAiB,EAAE,aAAqB,EAAE,KAAa,EAAE,IAAS,EAAE,SAAc,EAAE,IAAS,EAAE,MAAuB;IACvJ,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACvE,MAAM,EAAE,CAAC,MAAM,CAAC;;;KAGf,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;KACnF;AACH,CAAC"}
+{"version":3,"file":"mutationlogger.js","sourceRoot":"","sources":["../../src/util/mutationlogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAEzC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAE,SAAiB,EAAE,aAAqB,EAAE,KAAa,EAAE,IAAS,EAAE,SAAc,EAAE,IAAS,EAAE,MAAuB;IACvJ,IAAI,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;QACxF,MAAM,EAAE,CAAC,MAAM,CAAC;;;KAGf,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;KACpF;AACH,CAAC"}

package/dist/util/scheduler.d.ts

@@ -0,0 +1,66 @@
+import { Queryable } from 'mysql2-async';
+export interface SchedulerOpts {
+    /**
+     * Minimum number of minutes that need to go by before the task will be run again.
+     *
+     * For instance, if you set this to 30, the task will run approximately every 30 minutes.
+     *
+     * If there is downtime, the task will likely run immediately after startup.
+     */
+    minutesBetween?: number;
+    /**
+     * Task will only execute during the given hour, if it has been long enough
+     * since the last execution to satisfy minutesBetween.
+     *
+     * Hour is in the API container's time zone, be sure to set it appropriately with the
+     * TZ environment variable.
+     *
+     * Starts with 0 (12am-1am), ends at 23 (11pm-12am)
+     *
+     * For a nightly task that should only execute once, set this to the desired hour
+     * and minutesBetween > 60. Smaller minutesBetween will mean more executions during
+     * that hour.
+     */
+    duringHour?: number;
+    /**
+     * Task will only execute during the given day of the week.
+     *
+     * 1 is Monday and 7 is Sunday
+     *
+     * Best used with duringHour or with minutesBetween > 24 * 60 - note that if
+     * minutesBetween is small, the task will execute many times on the given day.
+     */
+    duringDayOfWeek?: DayOfWeek;
+    /**
+     * Task will only execute during the given day of the month.
+     *
+     * Starts with 1
+     *
+     * Best used with duringHour or with minutesBetween > 24 * 60 - note that if
+     * minutesBetween is small, the task will execute many times on the given day.
+     */
+    duringDayOfMonth?: number;
+}
+export declare type SchedulerJob = () => Promise<void> | void;
+export declare enum DayOfWeek {
+    MONDAY = 1,
+    TUESDAY = 2,
+    WEDNESDAY = 3,
+    THURSDAY = 4,
+    FRIDAY = 5,
+    SATURDAY = 6,
+    SUNDAY = 7
+}
+declare class Scheduler {
+    protected jobs: Map<string, {
+        job: SchedulerJob;
+    } & SchedulerOpts & {
+        minutesBetween: number;
+    }>;
+    protected started: boolean;
+    schedule(jobname: string, job: SchedulerJob, opts: SchedulerOpts): Promise<void>;
+    start(): Promise<void>;
+    static createTable(db: Queryable): Promise<void>;
+}
+export declare const scheduler: Scheduler;
+export {};