@saltcorn/data 1.5.0-beta.8 → 1.5.0-rc.1

package/dist/models/notification.js

@@ -11,7 +11,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const db_1 = __importDefault(require("../db"));
 const user_1 = __importDefault(require("./user"));
 const state_1 = __importDefault(require("../db/state"));
-const push_message_helper_1 = require("./internal/push_message_helper");
 const utils_1 = __importDefault(require("../utils"));
 const mail_queue_1 = require("./internal/mail_queue");
 const { getState } = state_1.default;
@@ -79,10 +78,8 @@ class Notification {
                 eval_js: "check_saltcorn_notifications()",
             }, [user.id]);
         }
-        if (isPushEnabled(user)) {
-            const pushHelper = new push_message_helper_1.PushMessageHelper(state?.getConfig("push_notification_subscriptions", {})[user.id] || []);
-            await pushHelper.send(o);
-        }
+        if (isPushEnabled(user) && state?.pushHelper)
+            state.pushHelper.pushNotification(o);
         return o;
     }
     async mark_as_read() {

package/dist/models/notification.js.map

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

package/dist/models/page.d.ts

@@ -77,6 +77,7 @@ declare class Page implements AbstractPage {
     get html_file(): string | undefined;
     connected_objects(): ConnectedObjects;
     getTags(): Promise<Array<AbstractTag>>;
+    static renderEachEmbeddedPageInLayout(layout: Layout, querystate: Row, extraArgs: RunExtra): Promise<void>;
 }
 export = Page;
 //# sourceMappingURL=page.d.ts.map

package/dist/models/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,+CAA+C,CAAC;AA4BvD,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAI3E;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;OAEG;gBACS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAgBxC;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAWvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAkBzC;;;;;OAKG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;WAM3C,aAAa;IAI1B,iBAAiB;IAGjB;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7B;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYtD;;;OAGG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAKnC;IAED;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5B;;;;;OAKG;IACG,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgPvE,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAGlC;IAED,iBAAiB,IAAI,gBAAgB;IAI/B,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;CAI7C;AAED,SAAS,IAAI,CAAC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,+CAA+C,CAAC;AA4BvD,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAI3E;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;OAEG;gBACS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAgBxC;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAWvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAkBzC;;;;;OAKG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;WAM3C,aAAa;IAI1B,iBAAiB;IAGjB;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7B;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYtD;;;OAGG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAKnC;IAED;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5B;;;;;OAKG;IACG,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAuNvE,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAGlC;IAED,iBAAiB,IAAI,gBAAgB;IAI/B,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;WAK/B,8BAA8B,CACzC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,GAAG,EACf,SAAS,EAAE,QAAQ;CA6BtB;AAED,SAAS,IAAI,CAAC"}

package/dist/models/page.js

@@ -300,30 +300,7 @@ class Page {
                 }
             }
         }, querystate);
-        await eachPage(this.layout, async (segment) => {
-            const page = await Page.findOne({ name: segment.page });
-            if (!page) {
-                throw new InvalidConfiguration(`Page ${this.name} configuration error in embedded page: ` +
-                    (segment.page
-                        ? `page "${segment.page}" not found`
-                        : "no page specified"));
-            }
-            else if (page.name === this.name) {
-                throw new InvalidConfiguration(`Page ${this.name} configuration error in embedded page: Infinite loop page-in-page`);
-            }
-            else {
-                const role = (extraArgs.req.user || {}).role_id || 100;
-                const pageContent = await page.run(querystate, extraArgs);
-                const { getState } = require("../db/state");
-                segment.contents = getState().getLayout(extraArgs.req.user).renderBody({
-                    title: "",
-                    body: pageContent,
-                    req: extraArgs.req,
-                    role,
-                    alerts: [],
-                });
-            }
-        });
+        await Page.renderEachEmbeddedPageInLayout(this.layout, querystate, extraArgs);
         const pagename = this.name;
         let exit_from_redirect = false;
         await traverse(this.layout, {
@@ -426,6 +403,32 @@ class Page {
         const Tag = (await Promise.resolve().then(() => __importStar(require("./tag")))).default;
         return await Tag.findWithEntries({ page_id: this.id });
     }
+    static async renderEachEmbeddedPageInLayout(layout, querystate, extraArgs) {
+        await eachPage(layout, async (segment) => {
+            const page = await Page.findOne({ name: segment.page });
+            if (!page) {
+                throw new InvalidConfiguration(`Page ${this.name} configuration error in embedded page: ` +
+                    (segment.page
+                        ? `page "${segment.page}" not found`
+                        : "no page specified"));
+            }
+            else if (page.name === this.name) {
+                throw new InvalidConfiguration(`Page ${this.name} configuration error in embedded page: Infinite loop page-in-page`);
+            }
+            else {
+                const role = (extraArgs.req.user || {}).role_id || 100;
+                const pageContent = await page.run(querystate, extraArgs);
+                const { getState } = require("../db/state");
+                segment.contents = getState().getLayout(extraArgs.req.user).renderBody({
+                    title: "",
+                    body: pageContent,
+                    req: extraArgs.req,
+                    role,
+                    alerts: [],
+                });
+            }
+        });
+    }
 }
 module.exports = Page;
 //# sourceMappingURL=page.js.map

package/dist/models/page.js.map

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

package/dist/models/plugin.d.ts

@@ -58,22 +58,30 @@ declare class Plugin {
     dependant_views(): Promise<string[]>;
     ready_for_mobile(): boolean;
     static get_cached_plugins(): Array<Plugin>;
+    static read_local_store_entries(): Promise<any>;
     /**
      * List plugins available in store
+     * @param msgs - optional packages/plugins-loader/plugin_installer.jsmessages array
      * @returns {Promise<*>}
      */
-    static store_plugins_available(): Promise<Array<Plugin>>;
+    static store_plugins_available(msgs?: Array<string>): Promise<Array<Plugin>>;
     /**
      *
      * @returns {Promise<*>}
      */
-    static store_plugins_available_from_store(): Promise<Array<Plugin>>;
+    static store_plugins_available_from_store(endpoint?: string): Promise<Array<Plugin>>;
     /**
      *
      * @param name
      * @returns {Promise<null|Plugin>}
      */
-    static store_by_name(name: string): Promise<Plugin | null>;
+    static store_by_name(name: string, endpoint?: string): Promise<Plugin | null>;
+    /**
+     * check if plugin is base-plugin or sbadmin2
+     * @param name
+     * @returns
+     */
+    static is_fixed_plugin(name: string): boolean;
 }
 export = Plugin;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/models/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../models/plugin.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAgB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACX,MAAM,iDAAiD,CAAC;AAIzD;;;GAGG;AACH,cAAM,MAAM;IACV,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,MAAM,EAAE,gBAAgB,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;;OAGG;gBACS,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM;IAe9C;;;;OAIG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK1D;;;;OAIG;WACU,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAMxD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB7B;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B;;;;OAIG;IACG,eAAe,CACnB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,MAAM,EACtD,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAchB;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAiB1C,gBAAgB,IAAI,OAAO;IAQ3B,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC;IAM1C;;;OAGG;WACU,uBAAuB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IA+B9D;;;OAGG;WACU,kCAAkC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAuBzE;;;;OAIG;WACU,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAiBjE;AAED,SAAS,MAAM,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../models/plugin.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAgB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACX,MAAM,iDAAiD,CAAC;AAOzD;;;GAGG;AACH,cAAM,MAAM;IACV,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,MAAM,EAAE,gBAAgB,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;;OAGG;gBACS,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM;IAe9C;;;;OAIG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK1D;;;;OAIG;WACU,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAMxD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB7B;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B;;;;OAIG;IACG,eAAe,CACnB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,MAAM,EACtD,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;IAchB;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAiB1C,gBAAgB,IAAI,OAAO;IAQ3B,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC;WAO7B,wBAAwB,IAAI,OAAO,CAAC,GAAG,CAAC;IAQrD;;;;OAIG;WACU,uBAAuB,CAClC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GACnB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IA6DzB;;;OAGG;WACU,kCAAkC,CAC7C,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAqBzB;;;;OAIG;WACU,aAAa,CACxB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBzB;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAG9C;AAED,SAAS,MAAM,CAAC"}

package/dist/models/plugin.js

@@ -10,9 +10,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
  */
 const db_1 = __importDefault(require("../db"));
 const view_1 = __importDefault(require("./view"));
-const { isStale, getFetchProxyOptions } = require("../utils");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const { stringToJSON } = require("../utils");
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const utils_1 = __importDefault(require("../utils"));
+const { stringToJSON, isStale, getFetchProxyOptions, pluginsFolderRoot } = utils_1.default;
 /**
  * Plugin Class
  * @category saltcorn-data
@@ -134,17 +136,35 @@ class Plugin {
         const stored = getState().getConfigCopy("available_plugins", false);
         return stored || [];
     }
+    static async read_local_store_entries() {
+        return JSON.parse(await promises_1.default.readFile(path_1.default.join(pluginsFolderRoot, "store_entries.json"), "utf8"));
+    }
     /**
      * List plugins available in store
+     * @param msgs - optional packages/plugins-loader/plugin_installer.jsmessages array
      * @returns {Promise<*>}
      */
-    static async store_plugins_available() {
-        const { getState } = require("../db/state");
+    static async store_plugins_available(msgs) {
+        const { getState, getRootState } = require("../db/state");
         const stored = getState().getConfig("available_plugins", false);
         const stored_at = getState().getConfig("available_plugins_fetched_at", false);
         const airgap = getState().getConfig("airgap", false);
         const isRoot = db_1.default.getTenantSchema() === db_1.default.connectObj.default_schema;
-        if (!airgap && (!stored || !stored_at || isStale(stored_at))) {
+        if (airgap) {
+            try {
+                const modInfos = getRootState().getConfig("pre_installed_module_infos", []);
+                return modInfos
+                    .map((p) => new Plugin(p))
+                    .filter((p) => isRoot || !p.has_auth);
+            }
+            catch (e) {
+                getState().log(2, `Error reading store_entries.json: ${e}`);
+                if (msgs)
+                    msgs.push("Error reading local plugin store entries.");
+                return [];
+            }
+        }
+        else if (!stored || !stored_at || isStale(stored_at)) {
             try {
                 const from_api = await Plugin.store_plugins_available_from_store();
                 await getState().setConfig("available_plugins", from_api);
@@ -152,13 +172,24 @@ class Plugin {
                 return from_api.filter((p) => isRoot || !p.has_auth);
             }
             catch (e) {
-                console.error(e);
-                if (stored)
+                getState().log(2, `Error fetching plugin store entries: ${e}`);
+                if (stored) {
                     return stored
                         .map((p) => new Plugin(p))
                         .filter((p) => isRoot || !p.has_auth);
-                else
+                }
+                try {
+                    const modInfos = getRootState().getConfig("pre_installed_module_infos", []);
+                    return modInfos
+                        .map((p) => new Plugin(p))
+                        .filter((p) => isRoot || !p.has_auth);
+                }
+                catch (e2) {
+                    getState().log(2, `Error reading store_entries.json: ${e2}`);
+                    if (msgs)
+                        msgs.push("The store is not reachable and reading the local entries failed.");
                     return [];
+                }
             }
         }
         else
@@ -170,10 +201,10 @@ class Plugin {
      *
      * @returns {Promise<*>}
      */
-    static async store_plugins_available_from_store() {
+    static async store_plugins_available_from_store(endpoint) {
         //console.log("fetch plugins");
         const { getState } = require("../db/state");
-        const plugins_store_endpoint = getState().getConfig("plugins_store_endpoint", false);
+        const plugins_store_endpoint = endpoint || getState().getConfig("plugins_store_endpoint", false);
         // console.log(`[store_plugins_available_from_store] plugins_store_endpoint:%s`, plugins_store_endpoint);
         const fetchOptions = getFetchProxyOptions();
         getState().log(6, `store_plugins_available_from_store fetch options: ${JSON.stringify(fetchOptions)}`);
@@ -186,9 +217,9 @@ class Plugin {
      * @param name
      * @returns {Promise<null|Plugin>}
      */
-    static async store_by_name(name) {
+    static async store_by_name(name, endpoint) {
         const { getState } = require("../db/state");
-        const plugins_store_endpoint = getState().getConfig("plugins_store_endpoint", false);
+        const plugins_store_endpoint = endpoint || getState().getConfig("plugins_store_endpoint", false);
         // console.log(`[store_by_name] plugins_store_endpoint:%s`, plugins_store_endpoint);
         const response = await (0, node_fetch_1.default)(plugins_store_endpoint + "?name=" + encodeURIComponent(name), getFetchProxyOptions());
         const json = await response.json();
@@ -197,6 +228,14 @@ class Plugin {
         else
             return null;
     }
+    /**
+     * check if plugin is base-plugin or sbadmin2
+     * @param name
+     * @returns
+     */
+    static is_fixed_plugin(name) {
+        return ["@saltcorn/base-plugin", "@saltcorn/sbadmin2"].includes(name);
+    }
 }
 module.exports = Plugin;
 //# sourceMappingURL=plugin.js.map

package/dist/models/plugin.js.map

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

package/dist/models/s3_helpers.d.ts

@@ -0,0 +1,54 @@
+import { S3 } from "@aws-sdk/client-s3";
+type MetadataInput = {
+    min_role_read?: number;
+    user_id?: number;
+    mime_super?: string;
+    mime_sub?: string;
+    filename?: string;
+};
+type MetadataOutput = MetadataInput;
+export type S3ListResult = {
+    key: string;
+    relativePath: string;
+    size: number;
+    lastModified?: Date;
+};
+export type S3HeadResult = S3ListResult & {
+    metadata: MetadataOutput;
+    contentType?: string;
+};
+export declare const isS3Enabled: () => boolean;
+export declare const relativeKeyToPath: (key: string) => string;
+export declare const buildKeyFromRelative: (relPath?: string) => string;
+export declare const getResolvedBucket: () => string | undefined;
+export declare const getS3Client: () => S3;
+export declare const listS3Folder: (folder?: string, opts?: {
+    recursive?: boolean;
+}) => Promise<{
+    files: S3ListResult[];
+    directories: string[];
+}>;
+export declare const headObject: (relPath: string) => Promise<S3HeadResult | null>;
+export declare const setObjectMetadata: (relPath: string, metadata: MetadataInput) => Promise<void>;
+export declare const copyObject: (fromRelPath: string, toRelPath: string, opts?: {
+    metadata?: MetadataInput;
+}) => Promise<void>;
+export declare const deleteObject: (relPath: string) => Promise<void>;
+export declare const uploadBuffer: (relPath: string, buffer: Buffer, mimetype: string, metadata: MetadataInput) => Promise<void>;
+export declare const downloadBuffer: (relPath: string) => Promise<Buffer>;
+export declare const getSignedFileUrl: (relPath: string, opts?: {
+    download?: boolean;
+    filename?: string;
+    expiresIn?: number;
+}) => Promise<string>;
+export declare const getPublicFileUrl: (relPath: string, opts?: {
+    download?: boolean;
+    filename?: string;
+}) => string;
+export declare const getServeUrl: (relPath: string, opts?: {
+    download?: boolean;
+    filename?: string;
+}) => Promise<string>;
+export declare const publicUrlToRelativePath: (url?: string) => string | null;
+export {};
+//# sourceMappingURL=s3_helpers.d.ts.map

package/dist/models/s3_helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3_helpers.d.ts","sourceRoot":"","sources":["../../models/s3_helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAOL,EAAE,EACH,MAAM,oBAAoB,CAAC;AAmB5B,KAAK,aAAa,GAAG;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,cAAc,GAAG,aAAa,CAAC;AAEpC,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG;IACxC,QAAQ,EAAE,cAAc,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AA2HF,eAAO,MAAM,WAAW,QAAO,OACwB,CAAC;AAWxD,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,KAAG,MAM/C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,KAAG,MAMvD,CAAC;AAcF,eAAO,MAAM,iBAAiB,QAAO,MAAM,GAAG,SAG7C,CAAC;AAUF,eAAO,MAAM,WAAW,QAAO,EAmB9B,CAAC;AA0CF,eAAO,MAAM,YAAY,GACvB,SAAS,MAAM,EACf,OAAM;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,KACjC,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAkF1D,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,SAAS,MAAM,KACd,OAAO,CAAC,YAAY,GAAG,IAAI,CAuB7B,CAAC;AAuBF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,UAAU,aAAa,kBAKxB,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,OAAM;IAAE,QAAQ,CAAC,EAAE,aAAa,CAAA;CAAO,kBAWxC,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,SAAS,MAAM,kBAKjD,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,UAAU,aAAa,kBAcxB,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,MAAM,CAWpE,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,EACf,OAAM;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,KACvE,OAAO,CAAC,MAAM,CAgBhB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,SAAS,MAAM,EACf,OAAM;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,KACnD,MAcF,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,OAAM;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,KACnD,OAAO,CAAC,MAAM,CAMhB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,IAqC/D,CAAC"}