pakstr 0.23.0 → 0.25.0

package/README.md

@@ -76,6 +76,21 @@ npm run build
 npx pakstr run
 ```
 
+**If your CI runs the job inside a sandbox with its own kernel** - a Kata microVM, or any
+runner where the job container is given no host Docker socket - the job has to start its
+own Docker daemon, and that daemon's default bridge cannot be brought up inside the
+sandbox. Set `PAKSTR_DOCKER_NETWORK=host` so every container pakstr creates joins the
+sandbox's own network namespace instead:
+
+```bash
+PAKSTR_DOCKER_NETWORK=host npx pakstr run
+```
+
+It applies to the build container, the signing container and the short-lived copy
+containers alike, because all of them are created the same way. Leave it unset on a
+workstation, where Docker's default network is what you want - host networking is not
+available on Docker Desktop for macOS.
+
 ---
 
 ## Documentation & License

package/dist/commands/publish.js

@@ -15,6 +15,18 @@ const pakstrConfig_1 = require("../core/pakstrConfig");
 const nsite_1 = require("../core/nsite");
 const zapStore_1 = require("../core/zapStore");
 const zapstoreConfig_1 = require("../core/zapstoreConfig");
+function imageContentType(filePath) {
+    switch (path_1.default.extname(filePath).toLowerCase()) {
+        case ".png": return "image/png";
+        case ".jpg":
+        case ".jpeg": return "image/jpeg";
+        case ".gif": return "image/gif";
+        case ".webp": return "image/webp";
+        case ".svg": return "image/svg+xml";
+        case ".ico": return "image/x-icon";
+        default: return "application/octet-stream";
+    }
+}
 /** `pakstr publish` — optionally upload the signed APK and publish its Zapstore events. */
 async function publishCommand(configPath, options = {}) {
     if (options.blossomFetch && options.fetchImpl) {
@@ -108,6 +120,15 @@ async function publishCommand(configPath, options = {}) {
         console.log("Publishing as:", publishNsec.envVar);
         console.log("Publisher npub:", npub);
         console.log("Relay:", config.publish.relay);
+        const iconUrl = zapstoreConfig?.icon
+            ? (await (0, blossom_1.uploadToBlossom)({
+                serverUrl: config.publish.blossom,
+                filePath: zapstoreConfig.icon,
+                secret: publishNsec.bytes,
+                contentType: imageContentType(zapstoreConfig.icon),
+                fetchImpl,
+            })).url
+            : undefined;
         app = {
             appId: config.app.appId,
             appName: zapstoreConfig?.name ?? config.app.appName,
@@ -118,6 +139,7 @@ async function publishCommand(configPath, options = {}) {
             tags: zapstoreConfig?.tags,
             license: zapstoreConfig?.license,
             website: zapstoreConfig?.website,
+            icon: iconUrl,
             releaseNotes: zapstoreConfig?.releaseNotes,
             repository: zapstoreConfig?.repository ?? (0, zapstoreConfig_1.loadZapstoreRepository)(config.configDir),
         };

package/dist/core/zapStore.js

@@ -77,6 +77,7 @@ async function buildAppMetadataEvent(input) {
     const npub = (0, nostr_1.pubkeyHexToNpub)(pubkeyHex);
     const communities = input.communities?.length ? input.communities : [exports.DEFAULT_COMMUNITY];
     const summaryTags = input.app.summary !== undefined ? [["summary", input.app.summary]] : [];
+    const iconTags = input.app.icon !== undefined ? [["icon", input.app.icon]] : [];
     const topicTags = (input.app.tags ?? []).map(tag => ["t", tag]);
     const licenseTags = input.app.license !== undefined ? [["license", input.app.license]] : [];
     const websiteTags = input.app.website !== undefined ? [["url", input.app.website]] : [];
@@ -88,6 +89,7 @@ async function buildAppMetadataEvent(input) {
             ["d", input.app.appId],
             ["name", input.app.appName],
             ...summaryTags,
+            ...iconTags,
             ["f", PLATFORM],
             ...communities.map(c => ["h", c]),
             ...topicTags,

package/dist/core/zapstoreConfig.js

@@ -58,6 +58,10 @@ function loadZapstorePublisherConfig(configDir) {
     const tags = optionalTags(config.tags, configPath);
     const license = optionalString(config.license, "license", configPath);
     const website = optionalString(config.website, "website", configPath);
+    const iconPath = optionalString(config.icon, "icon", configPath);
+    const icon = iconPath === undefined
+        ? undefined
+        : resolveIconPath(iconPath, configDir, configPath);
     const releaseNotesPath = optionalString(config.release_notes, "release_notes", configPath);
     const releaseNotes = releaseNotesPath === undefined
         ? undefined
@@ -79,6 +83,7 @@ function loadZapstorePublisherConfig(configDir) {
         tags,
         license,
         website,
+        icon,
         releaseNotes,
     };
 }
@@ -94,7 +99,7 @@ function optionalString(value, field, configPath, trim = true) {
     if (typeof value !== "string") {
         throw new ZapstoreConfigError(`${exports.ZAPSTORE_CONFIG_FILENAME} field ${field} must be a string`, configPath);
     }
-    if (value.trim().length === 0 && field === "release_notes") {
+    if (value.trim().length === 0 && (field === "release_notes" || field === "icon")) {
         throw new ZapstoreConfigError(`${exports.ZAPSTORE_CONFIG_FILENAME} field ${field} must not be empty`, configPath);
     }
     return trim ? value.trim() : value;
@@ -112,6 +117,19 @@ function optionalTags(value, configPath) {
         return tag.trim();
     });
 }
+function resolveIconPath(iconPath, configDir, configPath) {
+    const resolved = path_1.default.resolve(configDir, iconPath);
+    if (!fs_1.default.existsSync(resolved) || !fs_1.default.lstatSync(resolved).isFile()) {
+        throw new ZapstoreConfigError(`${exports.ZAPSTORE_CONFIG_FILENAME} icon file not found: ${resolved}`, configPath);
+    }
+    try {
+        fs_1.default.accessSync(resolved, fs_1.default.constants.R_OK);
+    }
+    catch (error) {
+        throw new ZapstoreConfigError(`Could not read ${exports.ZAPSTORE_CONFIG_FILENAME} icon file ${resolved}: ${error instanceof Error ? error.message : String(error)}`, configPath);
+    }
+    return resolved;
+}
 function readReleaseNotes(releaseNotesPath, configDir, configPath) {
     const resolved = path_1.default.resolve(configDir, releaseNotesPath);
     if (!fs_1.default.existsSync(resolved) || !fs_1.default.lstatSync(resolved).isFile()) {

package/dist/runners/DockerGradleRunner.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
 const process_1 = require("./process");
+const dockerNetwork_1 = require("./dockerNetwork");
 const CONTAINER_RELEASE_APK_SIGNED = "/workspace/app/build/outputs/apk/release/app-release.apk";
 const CONTAINER_RELEASE_APK_UNSIGNED = "/workspace/app/build/outputs/apk/release/app-release-unsigned.apk";
 const CONTAINER_DEBUG_APK = "/workspace/app/build/outputs/apk/debug/app-debug.apk";
@@ -57,6 +58,7 @@ class DockerGradleRunner {
         this.execute("docker", [
             "run",
             "--rm",
+            ...(0, dockerNetwork_1.dockerNetworkArgs)(),
             "-v",
             `${storage.workspaceVolume}:/workspace`,
             this.image,
@@ -74,6 +76,7 @@ class DockerGradleRunner {
         this.execute("docker", [
             "run",
             "--rm",
+            ...(0, dockerNetwork_1.dockerNetworkArgs)(),
             "-v",
             `${storage.workspaceVolume}:/workspace`,
             this.image,
@@ -112,6 +115,7 @@ class DockerGradleRunner {
         try {
             this.execute("docker", [
                 "create",
+                ...(0, dockerNetwork_1.dockerNetworkArgs)(),
                 "--name",
                 container,
                 "-v",
@@ -132,6 +136,7 @@ class DockerGradleRunner {
         try {
             this.execute("docker", [
                 "create",
+                ...(0, dockerNetwork_1.dockerNetworkArgs)(),
                 "--name",
                 container,
                 "-v",

package/dist/runners/DockerSignRunner.js

@@ -10,6 +10,7 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const process_1 = require("./process");
+const dockerNetwork_1 = require("./dockerNetwork");
 class DockerSignRunner {
     image;
     execute;
@@ -53,6 +54,7 @@ class DockerSignRunner {
             const stdout = this.execute("docker", [
                 "run",
                 "--rm",
+                ...(0, dockerNetwork_1.dockerNetworkArgs)(),
                 "--tmpfs",
                 "/signing:mode=0700,uid=0",
                 "-v",
@@ -122,6 +124,7 @@ class DockerSignRunner {
         try {
             this.execute("docker", [
                 "create",
+                ...(0, dockerNetwork_1.dockerNetworkArgs)(),
                 "--name",
                 container,
                 "-v",
@@ -145,6 +148,7 @@ class DockerSignRunner {
         try {
             this.execute("docker", [
                 "create",
+                ...(0, dockerNetwork_1.dockerNetworkArgs)(),
                 "--name",
                 container,
                 "-v",

package/dist/runners/dockerNetwork.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dockerNetworkArgs = dockerNetworkArgs;
+/**
+ * The `--network` value passed to every container pakstr creates, read from
+ * PAKSTR_DOCKER_NETWORK.
+ *
+ * Unset means Docker's own default, which is what a workstation wants. A CI
+ * runner that sandboxes the job inside its own kernel needs the override: there
+ * the daemon's default bridge cannot be brought up - attaching a container to it
+ * writes to /proc/sys, which the sandbox exposes read-only - so `--network=host`
+ * puts the container in the sandbox's own network namespace instead, and the
+ * container inherits the resolvers the daemon itself uses.
+ *
+ * It is applied to `docker create` as well as `docker run`, because the workspace
+ * and artifact copy containers are created the same way and meet the same wall.
+ */
+function dockerNetworkArgs() {
+    const network = process.env.PAKSTR_DOCKER_NETWORK?.trim();
+    return network ? ["--network", network] : [];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",