@retaw106/mmc-oc 2.3.0 → 2.4.0

package/dist/{index-z2g20msd.js → index-azbmnekv.js}

@@ -8,7 +8,7 @@ function readString(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : undefined;
 }
-function normalizeModelEntry(entry, harness) {
+function normalizeModelEntry2(entry, harness) {
   if (typeof entry === "string") {
     const model = readString(entry);
     return model ? { model } : undefined;
@@ -33,7 +33,7 @@ function resolveFallbackEntries(value, harness) {
   const values = Array.isArray(value) ? value : value === undefined ? [] : [value];
   const resolved = [];
   for (const value of values) {
-    const entry = normalizeModelEntry(value, harness);
+    const entry = normalizeModelEntry2(value, harness);
     if (!entry || !isValidModelReference(entry))
       continue;
     if (resolved.some((candidate) => sameAttempt(candidate, entry)))
@@ -43,7 +43,7 @@ function resolveFallbackEntries(value, harness) {
   return resolved;
 }
 function resolvePrimaryEntry(args) {
-  const entry = normalizeModelEntry(args.entry, args.harness);
+  const entry = normalizeModelEntry2(args.entry, args.harness);
   if (!entry)
     return;
   const qualifier = entry.qualifier ?? readString(args.defaultQualifier);
@@ -62,4 +62,4 @@ function resolveHistorianModel2(config, harness) {
     fallbacks: resolveFallbackEntries(historian.fallback_models, harness)
   };
 }
-export { resolveHistorianModel2 };
+export { normalizeModelEntry2, resolveHistorianModel2 };

package/dist/{index-czba8tw3.js → index-dwh99z66.js}

@@ -1,6 +1,10 @@
 // src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 import { statSync } from "node:fs";
+var resourceRoot = new AsyncResource("magic-context:root");
+function inRootAsyncContext(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 var reportSlowPrivilegedWrite;
 function registerSlowWriteReporter(reporter) {
   reportSlowPrivilegedWrite = reporter;
@@ -191,7 +195,7 @@ function installTransactionRouting(db, readonly) {
         return endWriterTransaction(db, () => nativeExec(sql), sql);
       if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
         try {
-          return withAutocommitTimeout(db, () => nativeExec(sql));
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
         } finally {
           if (mayChangeTagIdentity(sql))
             tagIdentityWriteGeneration += 1;
@@ -333,7 +337,7 @@ function trackSqliteConnection(db, filename, options) {
 }
 var TrackedDatabase = new Proxy(DatabaseImpl, {
   construct(target, args) {
-    const db = Reflect.construct(target, args, target);
+    const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
     return trackSqliteConnection(db, args[0], args[1]);
   }
 });
@@ -577,29 +581,48 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   assertTransformWrite();
   const lease = foregroundWaitLease();
   if (isInTransaction(db))
     return operation();
   const scoped = lease || backgroundWriterScope.getStore();
   const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
-  if (scoped)
-    db.exec(`PRAGMA busy_timeout=${lease ? Math.floor(Math.min(lease.remainingWaitMs, lease.guard?.remainingMs() ?? Infinity)) : SHORT_BUSY_TIMEOUT_MS}`);
   const started = performance.now();
   let completed = false;
-  try {
+  const execute = () => {
     const result = operation();
     completed = true;
     return result;
+  };
+  try {
+    if (!scoped)
+      return execute();
+    if (singleStatement) {
+      db.exec("PRAGMA busy_timeout=0");
+      try {
+        return execute();
+      } catch (error) {
+        if (!isTransientSqliteError(error) || isInTransaction(db))
+          throw error;
+      }
+      assertTransformWrite();
+    }
+    const timeout = Math.floor(Math.min(lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS, lease?.guard?.remainingMs() ?? Infinity));
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
+    const waitStarted = performance.now();
+    try {
+      return execute();
+    } finally {
+      if (lease)
+        lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - waitStarted));
+    }
   } catch (error) {
     if (lease && isTransientSqliteError(error))
       throw new SqliteAcquisitionBusyError(error, "autocommit");
     throw error;
   } finally {
     const elapsed = performance.now() - started;
-    if (lease)
-      lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - elapsed);
     if (previous !== null)
       db.exec(`PRAGMA busy_timeout=${previous}`);
     if (elapsed >= SLOW_WRITER_LOG_MS)
@@ -856,4 +879,4 @@ async function withIndexChunk(input, operation) {
   }
 }
 
-export { registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, getTagIdentityWriteGeneration, Database, getSqliteDatabasePath, getSqliteMemoryStats, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, isTransientSqliteError, SqliteAcquisitionBusyError, beginSqliteWriterAsync, withAsyncPrivilegedWriter, withPrivilegedWriter, indexCoordinationInput, withIndexChunk };
+export { inRootAsyncContext, registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, getTagIdentityWriteGeneration, Database, getSqliteDatabasePath, getSqliteMemoryStats, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, isTransientSqliteError, SqliteAcquisitionBusyError, beginSqliteWriterAsync, withAsyncPrivilegedWriter, withPrivilegedWriter, indexCoordinationInput, withIndexChunk };