editmamei 0.22.2 → 0.22.4

package/dist/core/server.js

@@ -27,6 +27,7 @@ import { listTemplates } from '../utils/template-storage.js';
 import { Kernel } from '../kernel/kernel.js';
 import { HOST_MIN_ABI } from '../kernel/host-api.js';
 import { ceModule } from '../modules/ce/index.js';
+import { hostDetectionRuntime } from '../detection/runtime.js';
 export function classifyModuleOutcome(inputs) {
     if (inputs.proModuleLoaded && inputs.skipReason === null)
         return 'loaded';
@@ -208,6 +209,7 @@ export class EditmameiServer {
             registry: this.toolRegistry,
             connection: this.session.getConnection(),
             snippet: this.snippetClient,
+            detection: hostDetectionRuntime(),
             resolveModuleSnippet: (manifest) => manifest.goCoreSnippets && manifest.goCoreSnippets.length > 0 && this.proModule
                 ? new GoSnippetClient({ binaryPath: join(this.proModule.binDir, coreBinaryName()) })
                 : null,
@@ -328,6 +330,37 @@ export class EditmameiServer {
                 `${err instanceof Error ? err.message : String(err)}`);
         }
     }
+    async ensureEntitledModuleFresh(delivery = {}) {
+        if (this.moduleSkipReason !== null)
+            return;
+        if (!isProEntitled())
+            return;
+        const underTest = process.env.VITEST !== undefined || process.env.NODE_ENV === 'test';
+        if (underTest && !delivery.fetchImpl)
+            return;
+        const license = readLicense();
+        if (!license)
+            return;
+        try {
+            const prov = await provisionModules(license.key, {
+                config: delivery.config,
+                fetchImpl: delivery.fetchImpl,
+                signingKeys: delivery.signingKeys,
+                sleep: delivery.sleep,
+            });
+            for (const m of prov.installed) {
+                this.logger.info(`Pro module updated to v${m.version} — restart to load.`);
+            }
+            for (const e of prov.errors) {
+                this.logger.warn(`Pro-module freshness check could not provision the ${e.sku} module ` +
+                    `(staying on the installed version): ${e.message}`);
+            }
+        }
+        catch (err) {
+            this.logger.warn(`Background Pro-module freshness check failed (staying on the installed version): ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
     assertToolsClassified() {
         for (const tool of this.toolRegistry.list()) {
             tierOf(tool.name);
@@ -483,6 +516,7 @@ export class EditmameiServer {
         await this.server.connect(transport);
         void this.session.initialize().catch(() => undefined);
         void this.reprovisionIfModuleSkipped();
+        void this.ensureEntitledModuleFresh();
         this.telemetry.start();
         void this.telemetry.flushOutboxOnStartup();
         this.server.onclose = () => {

package/dist/detection/runtime.js

@@ -2,35 +2,60 @@ import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { decode } from 'jpeg-js';
-import { readFileSync } from 'node:fs';
-import * as ort from 'onnxruntime-web';
+import { existsSync, readFileSync } from 'node:fs';
+import * as staticOrt from 'onnxruntime-web';
+export let ort = staticOrt;
+let injectedLoadModel = null;
+let injectedModelDirs = null;
+export function useHostRuntime(host, proModelsDir) {
+    injectedLoadModel = host.loadModel;
+    ort = host.ort;
+    injectedModelDirs = [proModelsDir, host.ceModelsDir];
+}
+export function hostDetectionRuntime() {
+    return { loadModel: hostLoadModel, ort: staticOrt, ceModelsDir: hostModelsDir() };
+}
 let configured = false;
 function configureOrt() {
     if (configured)
         return;
     const require = createRequire(import.meta.url);
     const ortDist = dirname(require.resolve('onnxruntime-web'));
-    ort.env.wasm.wasmPaths = pathToFileURL(join(ortDist, '/')).href;
-    ort.env.wasm.numThreads = 1;
-    ort.env.logLevel = 'error';
+    staticOrt.env.wasm.wasmPaths = pathToFileURL(join(ortDist, '/')).href;
+    staticOrt.env.wasm.numThreads = 1;
+    staticOrt.env.logLevel = 'error';
     configured = true;
 }
 const sessions = new Map();
-export function loadModel(absPath) {
+function hostLoadModel(absPath) {
     configureOrt();
     let p = sessions.get(absPath);
     if (!p) {
-        p = ort.InferenceSession.create(absPath, { logSeverityLevel: 3 });
+        p = staticOrt.InferenceSession.create(absPath, { logSeverityLevel: 3 });
         sessions.set(absPath, p);
     }
     return p;
 }
-export function resolveModelPath(filename) {
+export function loadModel(absPath) {
+    return injectedLoadModel ? injectedLoadModel(absPath) : hostLoadModel(absPath);
+}
+function hostModelsDir() {
     const override = process.env.EDITMAMEI_MODELS_DIR;
     if (override)
-        return join(override, filename);
+        return override;
     const here = dirname(fileURLToPath(import.meta.url));
-    return join(here, '..', 'models', filename);
+    return join(here, '..', 'models');
+}
+export function resolveModelPath(filename) {
+    if (injectedModelDirs) {
+        for (const dir of injectedModelDirs) {
+            const candidate = join(dir, filename);
+            if (existsSync(candidate))
+                return candidate;
+        }
+        return join(injectedModelDirs[injectedModelDirs.length - 1], filename);
+    }
+    return join(hostModelsDir(), filename);
 }
 export function decodeJpeg(path) {
     let img;
@@ -43,4 +68,3 @@ export function decodeJpeg(path) {
     }
     return { width: img.width, height: img.height, data: img.data };
 }
-export { ort };

package/dist/kernel/host-api.js

@@ -1,2 +1,2 @@
-export const KERNEL_ABI = 1;
+export const KERNEL_ABI = 2;
 export const HOST_MIN_ABI = 1;

package/dist/kernel/kernel.js

@@ -1,12 +1,13 @@
 import { CompositeSnippetClient } from '../api/snippet-client.js';
 import { Logger } from '../utils/logger.js';
 import { runScript } from '../utils/run-script.js';
-import { KERNEL_ABI } from './host-api.js';
+import { KERNEL_ABI, } from './host-api.js';
 export class Kernel {
     registry;
     connection;
     snippet;
     resolveModuleSnippet;
+    detection;
     sessionId;
     logger;
     invokeDepth = 0;
@@ -16,6 +17,7 @@ export class Kernel {
         this.connection = deps.connection;
         this.snippet = deps.snippet;
         this.resolveModuleSnippet = deps.resolveModuleSnippet;
+        this.detection = deps.detection;
         this.sessionId = deps.sessionId;
         this.logger = deps.logger;
     }
@@ -35,6 +37,7 @@ export class Kernel {
             connection: this.connection,
             executeScript: (innerBody, timeoutMs) => runScript(this.connection, innerBody, timeoutMs),
             snippet: this.snippetFor(manifest),
+            detection: this.detection,
             session: { id: this.sessionId },
             logger: new Logger(`module:${manifest.id}`),
         };

package/dist/license/entitlement.js

@@ -4,8 +4,8 @@ import { readLicense, writeLicense, clearLicense, } from './store.js';
 import { PolarLicenseClient, PolarLicenseError } from './polar-client.js';
 import { Logger } from '../utils/logger.js';
 const logger = new Logger('License');
-export const GRACE_MS = 30 * 24 * 60 * 60 * 1000;
-export const REFRESH_AFTER_MS = 7 * 24 * 60 * 60 * 1000;
+export const GRACE_MS = 7 * 24 * 60 * 60 * 1000;
+export const REFRESH_AFTER_MS = 24 * 60 * 60 * 1000;
 export const EXPIRED_REFRESH_TIMEOUT_MS = 5_000;
 export const CLOCK_SKEW_TOLERANCE_MS = 24 * 60 * 60 * 1000;
 export function evaluateEntitlement(rec, now) {

package/dist/license/ping-refresh.js

@@ -1,10 +1,14 @@
 import { refreshIfStale } from './entitlement.js';
-export function createPingLicenseRefresher(refresh = refreshIfStale) {
-    let fired = false;
+export const PING_REFRESH_MIN_INTERVAL_MS = 15 * 60_000;
+export function createPingLicenseRefresher(refresh = refreshIfStale, opts = {}) {
+    const now = opts.now ?? Date.now;
+    const minIntervalMs = opts.minIntervalMs ?? PING_REFRESH_MIN_INTERVAL_MS;
+    let lastAttemptAt = Number.NEGATIVE_INFINITY;
     return () => {
-        if (fired)
+        const t = now();
+        if (t - lastAttemptAt < minIntervalMs)
             return;
-        fired = true;
+        lastAttemptAt = t;
         try {
             void refresh().catch(() => { });
         }

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.22.2';
+export const VERSION = '0.22.4';

package/package.json

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