editmamei 0.17.3 → 0.17.5

package/dist/delivery/signing.js

@@ -1,7 +1,7 @@
 import { createPublicKey, verify } from 'node:crypto';
-export const MODULE_SIGNING_PUBLIC_KEYS = [
-    'MCowBQYDK2VwAyEA0DfcGMets2SlBofK4iFzLddKZB6mJF/E3beKFpLRN2o=',
-];
+export const DEV_MODULE_SIGNING_PUBLIC_KEY = 'MCowBQYDK2VwAyEA0DfcGMets2SlBofK4iFzLddKZB6mJF/E3beKFpLRN2o=';
+const PROD_MODULE_SIGNING_PUBLIC_KEY = 'MCowBQYDK2VwAyEAweoGOWvtf+aukiAD0FpuECSbCdZMeFzF2XYzbFWwfwo=';
+export const MODULE_SIGNING_PUBLIC_KEYS = [PROD_MODULE_SIGNING_PUBLIC_KEY];
 export function moduleSigMessage(sku, version, sha256Hex) {
     return Buffer.from(`editmamei-module-sig-v1\n${sku}\n${version}\n${sha256Hex}`, 'utf8');
 }

package/dist/license/env-activation.js

@@ -1,20 +1,59 @@
 import { Logger } from '../utils/logger.js';
 import { readLicense } from './store.js';
-import { activate } from './entitlement.js';
+import { activate, isProEntitled } from './entitlement.js';
+import { provisionModules } from '../delivery/provision.js';
+import { readInstalledModule, PRO_SKU } from '../delivery/store.js';
 const logger = new Logger('License');
-export async function maybeActivateFromEnv(env = process.env, ops = {}) {
+const PROVISION_BOOT_TIMEOUT_MS = 20_000;
+export async function maybeActivateFromEnv(env = process.env, ops = {}, delivery = {}) {
     const key = (env.EDITMAMEI_LICENSE_KEY ?? '').trim();
     if (!key)
         return;
     const cached = readLicense(ops);
-    if (cached && cached.key === key)
-        return;
+    if (!cached || cached.key !== key) {
+        try {
+            await activate(key, ops);
+            logger.info('Activated Pro from EDITMAMEI_LICENSE_KEY.');
+        }
+        catch (err) {
+            logger.warn(`Could not activate from EDITMAMEI_LICENSE_KEY (continuing as Community): ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+            return;
+        }
+    }
     try {
-        await activate(key, ops);
-        logger.info('Activated Pro from EDITMAMEI_LICENSE_KEY.');
+        if (isProEntitled(ops) && !readInstalledModule(PRO_SKU, ops)) {
+            const provisioning = provisionModules(key, {
+                dir: ops.dir,
+                now: ops.now,
+                config: delivery.config,
+                fetchImpl: delivery.fetchImpl,
+                sleep: delivery.sleep,
+                signingKeys: delivery.signingKeys,
+            });
+            provisioning.catch(() => { });
+            let timer;
+            const deadline = new Promise((resolve) => {
+                timer = setTimeout(() => resolve(null), delivery.bootTimeoutMs ?? PROVISION_BOOT_TIMEOUT_MS);
+                timer.unref?.();
+            });
+            const prov = await Promise.race([provisioning, deadline]);
+            if (timer)
+                clearTimeout(timer);
+            if (!prov) {
+                logger.warn('Pro module provisioning did not finish in time — continuing as Community; the next start retries.');
+            }
+            else {
+                for (const m of prov.installed)
+                    logger.info(`Installed ${m.sku} module v${m.version}.`);
+                for (const e of prov.errors) {
+                    logger.warn(`Could not provision the ${e.sku} module (Pro stays dark): ${e.message}`);
+                }
+            }
+        }
     }
     catch (err) {
-        logger.warn(`Could not activate from EDITMAMEI_LICENSE_KEY (continuing as Community): ` +
+        logger.warn(`Pro module provisioning failed (continuing without Pro): ` +
             `${err instanceof Error ? err.message : String(err)}`);
     }
 }

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.17.3';
+export const VERSION = '0.17.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editmamei",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "Editmamei — Unlock Photoshop with natural-language photo editing (Community Edition)",
   "main": "dist/index.js",
   "type": "module",