casualos 4.1.3 → 4.1.4

package/dist/cli.js

@@ -137353,7 +137353,14 @@ var WEB_CONFIG_SCHEMA = external_exports.object({
       "The apple touch icon that should be used for the web client. If not specified, a default apple touch icon will be used. Should be 180x180 px and not use transparency (background should be a solid color)."
     )
   }).nullable().optional().describe("The set of icons that should be used for the web client."),
-  supportUrl: external_exports.string().min(1).nullable().optional()
+  supportUrl: external_exports.string().min(1).nullable().optional(),
+  postHogApiKey: external_exports.string().min(1).nullable().optional().describe(
+    "The API key that should be used for PostHog analytics. If not specified, then PostHog will not be initialized."
+  ),
+  postHogApiHost: external_exports.string().min(1).nullable().optional().describe(
+    "The HTTP host that should be used for PostHog analytics. If not specified, then the default PostHog cloud host will be used."
+  ),
+  enableSimpleAnalytics: external_exports.boolean().nullable().optional().describe("Whether to enable simple analytics. Defaults to false.")
 });
 
 // ../aux-common/common/Version.ts
@@ -149337,7 +149344,7 @@ var trace = TraceAPI.getInstance();
 function hashLowEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   );
   return tracer.startActiveSpan(
     "hashLowEntropyPasswordWithSalt",
@@ -149355,7 +149362,7 @@ function hashLowEntropyPasswordWithSalt2(password, salt) {
 function hashHighEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   );
   return tracer.startActiveSpan(
     "hashHighEntropyPasswordWithSalt",
@@ -149373,7 +149380,7 @@ function hashHighEntropyPasswordWithSalt2(password, salt) {
 function verifyPasswordAgainstHashes2(password, salt, hashes) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   );
   return tracer.startActiveSpan(
     "verifyPasswordAgainstHashes",
@@ -156946,7 +156953,7 @@ var import_semantic_conventions = __toESM(require_src3());
 function traced(tracerName, options = {}, metricOptions = {}) {
   const tracer = trace.getTracer(
     tracerName,
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   );
   return function(target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
@@ -157032,7 +157039,7 @@ function getHistogram(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   ).createHistogram(meter.name, meter.options);
 }
 function getCounter(meter) {
@@ -157041,7 +157048,7 @@ function getCounter(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v4.1.3"
+    false ? void 0 : "v4.1.4"
   ).createCounter(meter.name, meter.options);
 }
 function traceHttpResponse(options = {}) {
@@ -169025,7 +169032,9 @@ var COM_ID_PLAYER_CONFIG = WEB_CONFIG_SCHEMA.pick({
   jitsiAppName: true,
   what3WordsApiKey: true,
   logoBackgroundColor: true,
-  disableVM: true
+  disableVM: true,
+  postHogApiKey: true,
+  postHogApiHost: true
 }).partial();
 var COM_ID_WEB_CONFIG_SCHEMA = external_exports.object({
   playerConfig: COM_ID_PLAYER_CONFIG,
@@ -171021,7 +171030,7 @@ var RecordsServer = class {
     this._viewTemplateRenderer = viewTemplateRenderer;
     this._tracer = trace.getTracer(
       "RecordsServer",
-      false ? void 0 : "v4.1.3"
+      false ? void 0 : "v4.1.4"
     );
     this._purchasableItems = purchasableItemsController;
     this._procedures = this._createProcedures();
@@ -171085,6 +171094,56 @@ var RecordsServer = class {
               );
             }
           }
+          if (config3.value.postHogApiKey) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  type: "text/plain",
+                  id: "posthog-api-key",
+                  dangerouslySetInnerHTML: {
+                    __html: config3.value.postHogApiKey
+                  }
+                }
+              )
+            );
+          }
+          if (config3.value.postHogApiHost) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  type: "text/plain",
+                  id: "posthog-host",
+                  dangerouslySetInnerHTML: {
+                    __html: config3.value.postHogApiHost
+                  }
+                }
+              )
+            );
+          }
+          if (config3.value.enableSimpleAnalytics) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  id: "simple-analytics",
+                  async: true,
+                  defer: true,
+                  "data-allow-params": "pattern,ask,inst",
+                  src: "https://scripts.simpleanalyticscdn.com/latest.js"
+                }
+              ),
+              /* @__PURE__ */ React.createElement("noscript", null, /* @__PURE__ */ React.createElement(
+                "img",
+                {
+                  src: "https://queue.simpleanalyticscdn.com/noscript.gif",
+                  alt: "",
+                  referrerpolicy: "no-referrer-when-downgrade"
+                }
+              ))
+            );
+          }
           if (config3.value.icons) {
             if (config3.value.icons.appleTouchIcon) {
               icons.push(
@@ -171160,6 +171219,56 @@ var RecordsServer = class {
               }
             )
           );
+          if (config3.value.postHogApiKey) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  type: "text/plain",
+                  id: "posthog-api-key",
+                  dangerouslySetInnerHTML: {
+                    __html: config3.value.postHogApiKey
+                  }
+                }
+              )
+            );
+          }
+          if (config3.value.postHogApiHost) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  type: "text/plain",
+                  id: "posthog-host",
+                  dangerouslySetInnerHTML: {
+                    __html: config3.value.postHogApiHost
+                  }
+                }
+              )
+            );
+          }
+          if (config3.value.enableSimpleAnalytics) {
+            postApp.push(
+              /* @__PURE__ */ React.createElement(
+                "script",
+                {
+                  id: "simple-analytics",
+                  async: true,
+                  defer: true,
+                  "data-allow-params": "pattern,ask,inst",
+                  src: "https://scripts.simpleanalyticscdn.com/latest.js"
+                }
+              ),
+              /* @__PURE__ */ React.createElement("noscript", null, /* @__PURE__ */ React.createElement(
+                "img",
+                {
+                  src: "https://queue.simpleanalyticscdn.com/noscript.gif",
+                  alt: "",
+                  referrerpolicy: "no-referrer-when-downgrade"
+                }
+              ))
+            );
+          }
           let csp = `default-src 'self' https://js.stripe.com; img-src 'self' https://*; style-src 'self' 'unsafe-inline'; frame-src https://js.stripe.com; child-src https://*; connect-src 'self'  https://scripts.simpleanalyticscdn.com http://localhost:9000 *.s3.amazonaws.com`;
           if (config3.value.recordsOrigin) {
             csp += ` ${config3.value.recordsOrigin};`;
@@ -174934,8 +175043,8 @@ var RecordsServer = class {
         return {
           success: true,
           ...metadata,
-          version: true ? "v4.1.3" : void 0,
-          versionHash: true ? "cfbc9d3d9c32d92c0bf90f496844e487f7ecfda5" : void 0
+          version: true ? "v4.1.4" : void 0,
+          versionHash: true ? "3a264de49101c026bc0d15d0e7958e5b6955c03a" : void 0
         };
       }),
       getPurchasableItem: procedure().origins(true).http("GET", "/api/v2/records/purchasableItems").inputs(
@@ -190836,82 +190945,66 @@ var CachingConfigStore = class {
     const cached2 = await this._cache.retrieve(
       key
     );
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getConfiguration(key, defaultValue);
-    if (result) {
-      await this._cache.store(key, result, this._cacheSeconds);
-    }
+    await this._cache.store(key, result, this._cacheSeconds);
     return result;
   }
   async getWebConfig() {
     const cached2 = await this._cache.retrieve(WEB_CONFIG_KEY);
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getWebConfig();
-    if (result) {
-      await this._cache.store(WEB_CONFIG_KEY, result, this._cacheSeconds);
-    }
+    await this._cache.store(WEB_CONFIG_KEY, result, this._cacheSeconds);
     return result;
   }
   async getPlayerWebManifest() {
     const cached2 = await this._cache.retrieve(
       PLAYER_WEB_MANIFEST_KEY
     );
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getPlayerWebManifest();
-    if (result) {
-      await this._cache.store(
-        PLAYER_WEB_MANIFEST_KEY,
-        result,
-        this._cacheSeconds
-      );
-    }
+    await this._cache.store(
+      PLAYER_WEB_MANIFEST_KEY,
+      result,
+      this._cacheSeconds
+    );
     return result;
   }
   async getSubscriptionConfiguration() {
     const cached2 = await this._cache.retrieve(
       "subscriptions"
     );
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getSubscriptionConfiguration();
-    if (result) {
-      await this._cache.store(
-        "subscriptions",
-        result,
-        this._cacheSeconds
-      );
-    }
+    await this._cache.store("subscriptions", result, this._cacheSeconds);
     return result;
   }
   async getPrivoConfiguration() {
     const cached2 = await this._cache.retrieve("privo");
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getPrivoConfiguration();
-    if (result) {
-      await this._cache.store("privo", result, this._cacheSeconds);
-    }
+    await this._cache.store("privo", result, this._cacheSeconds);
     return result;
   }
   async getModerationConfig() {
     const cached2 = await this._cache.retrieve(
       "moderation"
     );
-    if (cached2) {
+    if (typeof cached2 !== "undefined") {
       return cached2;
     }
     const result = await this._store.getModerationConfig();
-    if (result) {
-      await this._cache.store("moderation", result, this._cacheSeconds);
-    }
+    await this._cache.store("moderation", result, this._cacheSeconds);
     return result;
   }
 };
@@ -196632,8 +196725,8 @@ Because repo/add_updates is a very common permission, we periodically cache perm
         "The TLS configuration for the CasualOS app. If not provided, then TLS will not be used."
       ),
       proxy: external_exports.object({
-        trust: external_exports.string().optional().describe(
-          "The IP Address range of proxies that should be trusted."
+        trust: external_exports.union([external_exports.string(), external_exports.boolean(), external_exports.number()]).optional().describe(
+          'The express.js "trust proxy" value. Can be a string, boolean, or number representing the IP Address range of proxies that should be trusted.'
         )
       }).optional().describe("The proxy configuration for the CasualOS app."),
       debug: external_exports.boolean().prefault(false).describe(
@@ -231564,7 +231657,7 @@ var config2 = new Conf({
   projectName: "casualos-cli"
 });
 var program2 = new Command();
-program2.name("casualos").description("A CLI for CasualOS").version("v4.1.3").option(
+program2.name("casualos").description("A CLI for CasualOS").version("v4.1.4").option(
   "-e, --endpoint <url>",
   "The endpoint to use for queries. Can be used to override the current endpoint."
 ).option(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casualos",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "Command line interface for CasualOS.",
   "main": "./dist/index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@casual-simulation/aux-common": "^4.1.3",
-    "@casual-simulation/aux-records": "^4.1.3",
-    "@casual-simulation/aux-runtime": "^4.1.3",
-    "@casual-simulation/aux-vm": "^4.1.3",
+    "@casual-simulation/aux-common": "^4.1.4",
+    "@casual-simulation/aux-records": "^4.1.4",
+    "@casual-simulation/aux-runtime": "^4.1.4",
+    "@casual-simulation/aux-vm": "^4.1.4",
     "@octokit/app": "^15.1.0",
     "@octokit/auth-oauth-device": "^7.1.1",
     "@octokit/core": "^6.1.2",