@zintrust/workers 0.1.43 → 0.1.54

package/dist/WorkerFactory.js

@@ -39,12 +39,20 @@ const buildCandidatesForSpecifier = (specifier, root) => {
         return [
             path.join(root, 'dist', 'src', 'index.js'),
             path.join(root, 'dist', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'core', 'dist', 'src', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'core', 'dist', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'core', 'src', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'core', 'index.js'),
             path.join(root, 'src', 'index.ts'),
         ];
     }
     if (specifier === '@zintrust/workers') {
         return [
             path.join(root, 'dist', 'packages', 'workers', 'src', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'workers', 'dist', 'src', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'workers', 'dist', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'workers', 'src', 'index.js'),
+            path.join(root, 'node_modules', '@zintrust', 'workers', 'index.js'),
             path.join(root, 'packages', 'workers', 'src', 'index.ts'),
         ];
     }
@@ -78,8 +86,10 @@ const resolvePackageSpecifierUrl = (specifier) => {
     try {
         const require = NodeSingletons.module.createRequire(import.meta.url);
         const resolved = require.resolve(specifier);
-        if (specifier === '@zintrust/workers' &&
-            resolved.includes(`${path.sep}node_modules${path.sep}@zintrust${path.sep}workers${path.sep}`)) {
+        if ((specifier === '@zintrust/workers' &&
+            resolved.includes(`${path.sep}node_modules${path.sep}@zintrust${path.sep}workers${path.sep}`)) ||
+            (specifier === '@zintrust/core' &&
+                resolved.includes(`${path.sep}node_modules${path.sep}@zintrust${path.sep}core${path.sep}`))) {
             const local = resolveLocalPackageFallback(specifier);
             if (local)
                 return local;
@@ -134,6 +144,14 @@ const shouldFallbackToFileImport = (error) => {
         message.includes('base scheme is not hierarchical') ||
         message.includes('Failed to resolve module specifier'));
 };
+const isOptionalD1ProxyModuleMissing = (error) => {
+    const message = error instanceof Error ? error.message : String(error);
+    const code = error?.code ?? '';
+    if (code !== 'ERR_MODULE_NOT_FOUND')
+        return false;
+    return (message.includes('cloudflare-d1-proxy') ||
+        message.includes('/packages/cloudflare-d1-proxy/src/index.js'));
+};
 const importModuleFromCode = async (params) => {
     const { code, normalized, cacheKey } = params;
     const dataUrl = `data:text/javascript;base64,${toBase64(code)}`;
@@ -154,6 +172,9 @@ const importModuleFromCode = async (params) => {
             return (await import(fileUrl));
         }
         catch (fileError) {
+            if (isOptionalD1ProxyModuleMissing(fileError)) {
+                throw fileError;
+            }
             Logger.debug(`Processor URL file fallback failed for ${normalized}`, fileError);
             throw error;
         }
@@ -552,6 +573,10 @@ const fetchProcessorAttempt = async (params) => {
         return await cacheProcessorFromResponse({ response, normalized, config, cacheKey });
     }
     catch (error) {
+        if (isOptionalD1ProxyModuleMissing(error)) {
+            Logger.warn('Processor URL skipped: optional cloudflare-d1-proxy module is unavailable in this runtime.');
+            return undefined;
+        }
         if (controller.signal.aborted) {
             Logger.error('Processor URL fetch timeout', error);
         }

package/dist/http/middleware/FeaturesValidator.js

@@ -20,8 +20,8 @@ export const withFeaturesValidation = (handler) => {
             if (!features) {
                 return handler(req, res); // Skip validation if features is not provided
             }
-            // Check if features is an object
-            if (typeof features !== 'object' || features === null || Array.isArray(features)) {
+            const isPlainObject = Object.prototype.toString.call(features) === '[object Object]' && !Array.isArray(features);
+            if (!isPlainObject) {
                 return res.setStatus(400).json({
                     error: 'Invalid features configuration',
                     message: 'Features must be an object',
@@ -29,7 +29,8 @@ export const withFeaturesValidation = (handler) => {
                 });
             }
             // Validate each feature key and value
-            const featureKeys = Object.keys(features);
+            const featuresObj = features;
+            const featureKeys = Object.keys(featuresObj);
             for (const key of featureKeys) {
                 if (!VALID_FEATURES.has(key)) {
                     return res.setStatus(400).json({
@@ -38,7 +39,7 @@ export const withFeaturesValidation = (handler) => {
                         code: 'INVALID_FEATURE',
                     });
                 }
-                const value = features[key];
+                const value = featuresObj[key];
                 if (typeof value !== 'boolean') {
                     return res.setStatus(400).json({
                         error: 'Invalid feature value',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/workers",
-  "version": "0.1.43",
+  "version": "0.1.54",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -35,7 +35,7 @@
     "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "@zintrust/core": "^0.1.43"
+    "@zintrust/core": "^0.1.54"
   },
   "publishConfig": {
     "access": "public"

package/src/WorkerFactory.ts

@@ -72,6 +72,10 @@ const buildCandidatesForSpecifier = (specifier: string, root: string): string[]
     return [
       path.join(root, 'dist', 'src', 'index.js'),
       path.join(root, 'dist', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'core', 'dist', 'src', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'core', 'dist', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'core', 'src', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'core', 'index.js'),
       path.join(root, 'src', 'index.ts'),
     ];
   }
@@ -79,6 +83,10 @@ const buildCandidatesForSpecifier = (specifier: string, root: string): string[]
   if (specifier === '@zintrust/workers') {
     return [
       path.join(root, 'dist', 'packages', 'workers', 'src', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'workers', 'dist', 'src', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'workers', 'dist', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'workers', 'src', 'index.js'),
+      path.join(root, 'node_modules', '@zintrust', 'workers', 'index.js'),
       path.join(root, 'packages', 'workers', 'src', 'index.ts'),
     ];
   }
@@ -114,8 +122,12 @@ const resolvePackageSpecifierUrl = (specifier: string): string | null => {
     const require = NodeSingletons.module.createRequire(import.meta.url);
     const resolved = require.resolve(specifier);
     if (
-      specifier === '@zintrust/workers' &&
-      resolved.includes(`${path.sep}node_modules${path.sep}@zintrust${path.sep}workers${path.sep}`)
+      (specifier === '@zintrust/workers' &&
+        resolved.includes(
+          `${path.sep}node_modules${path.sep}@zintrust${path.sep}workers${path.sep}`
+        )) ||
+      (specifier === '@zintrust/core' &&
+        resolved.includes(`${path.sep}node_modules${path.sep}@zintrust${path.sep}core${path.sep}`))
     ) {
       const local = resolveLocalPackageFallback(specifier);
       if (local) return local;
@@ -173,6 +185,18 @@ const shouldFallbackToFileImport = (error: unknown): boolean => {
   );
 };
 
+const isOptionalD1ProxyModuleMissing = (error: unknown): boolean => {
+  const message = error instanceof Error ? error.message : String(error);
+  const code = (error as { code?: string } | undefined)?.code ?? '';
+
+  if (code !== 'ERR_MODULE_NOT_FOUND') return false;
+
+  return (
+    message.includes('cloudflare-d1-proxy') ||
+    message.includes('/packages/cloudflare-d1-proxy/src/index.js')
+  );
+};
+
 const importModuleFromCode = async (params: {
   code: string;
   normalized: string;
@@ -195,6 +219,9 @@ const importModuleFromCode = async (params: {
       const fileUrl = NodeSingletons.url.pathToFileURL(filePath).href;
       return (await import(fileUrl)) as Record<string, unknown>;
     } catch (fileError) {
+      if (isOptionalD1ProxyModuleMissing(fileError)) {
+        throw fileError;
+      }
       Logger.debug(`Processor URL file fallback failed for ${normalized}`, fileError);
       throw error;
     }
@@ -815,6 +842,13 @@ const fetchProcessorAttempt = async (params: {
 
     return await cacheProcessorFromResponse({ response, normalized, config, cacheKey });
   } catch (error) {
+    if (isOptionalD1ProxyModuleMissing(error)) {
+      Logger.warn(
+        'Processor URL skipped: optional cloudflare-d1-proxy module is unavailable in this runtime.'
+      );
+      return undefined;
+    }
+
     if (controller.signal.aborted) {
       Logger.error('Processor URL fetch timeout', error);
     } else {

package/src/http/middleware/FeaturesValidator.ts

@@ -2,20 +2,6 @@ import { Logger, type IRequest, type IResponse } from '@zintrust/core';
 
 export type RouteHandler = (req: IRequest, res: IResponse) => Promise<void> | void;
 
-interface FeaturesConfig {
-  clustering: boolean;
-  metrics: boolean;
-  autoScaling: boolean;
-  circuitBreaker: boolean;
-  deadLetterQueue: boolean;
-  resourceMonitoring: boolean;
-  compliance: boolean;
-  observability: boolean;
-  plugins: boolean;
-  versioning: boolean;
-  datacenterOrchestration: boolean;
-}
-
 const VALID_FEATURES = new Set([
   'clustering',
   'metrics',
@@ -34,14 +20,16 @@ export const withFeaturesValidation = (handler: RouteHandler): RouteHandler => {
   return async (req: IRequest, res: IResponse): Promise<void> => {
     try {
       const data = req.data();
-      const features = data['features'] as FeaturesConfig;
+      const features = data['features'] as unknown;
 
       if (!features) {
         return handler(req, res); // Skip validation if features is not provided
       }
 
-      // Check if features is an object
-      if (typeof features !== 'object' || features === null || Array.isArray(features)) {
+      const isPlainObject =
+        Object.prototype.toString.call(features) === '[object Object]' && !Array.isArray(features);
+
+      if (!isPlainObject) {
         return res.setStatus(400).json({
           error: 'Invalid features configuration',
           message: 'Features must be an object',
@@ -50,7 +38,8 @@ export const withFeaturesValidation = (handler: RouteHandler): RouteHandler => {
       }
 
       // Validate each feature key and value
-      const featureKeys = Object.keys(features);
+      const featuresObj = features as Record<string, unknown>;
+      const featureKeys = Object.keys(featuresObj);
       for (const key of featureKeys) {
         if (!VALID_FEATURES.has(key)) {
           return res.setStatus(400).json({
@@ -60,7 +49,7 @@ export const withFeaturesValidation = (handler: RouteHandler): RouteHandler => {
           });
         }
 
-        const value = features[key as keyof FeaturesConfig];
+        const value = featuresObj[key];
         if (typeof value !== 'boolean') {
           return res.setStatus(400).json({
             error: 'Invalid feature value',

package/src/ui/components/WorkerExpandPanel.js

@@ -202,8 +202,6 @@ const createEditJsonHandler = (worker, render) => {
  */
 const createWorkerExpandPanel = (worker, container) => {
   let element;
-  const jsonViewer = null;
-  const jsonEditor = null;
 
   const render = () => {
     if (element) {
@@ -229,12 +227,6 @@ const createWorkerExpandPanel = (worker, container) => {
   };
 
   const destroy = () => {
-    if (jsonViewer) {
-      jsonViewer.destroy();
-    }
-    if (jsonEditor) {
-      jsonEditor.destroy();
-    }
     element.remove();
   };
 

package/dist/WorkerShutdownDurableObject.d.ts

@@ -1,12 +0,0 @@
-type DurableObjectState = {
-    storage: {
-        get: (key: string) => Promise<unknown>;
-        put: (key: string, value: unknown) => Promise<void>;
-    };
-};
-export declare class ZinTrustWorkerShutdownDurableObject {
-    private readonly state;
-    constructor(state: DurableObjectState);
-    fetch(request: Request): Promise<Response>;
-}
-export {};

package/dist/WorkerShutdownDurableObject.js

@@ -1,41 +0,0 @@
-import { Logger } from '@zintrust/core';
-const loadState = async (state) => {
-    const stored = (await state.storage.get('shutdown'));
-    return stored ?? { shuttingDown: false };
-};
-const saveState = async (state, value) => {
-    await state.storage.put('shutdown', value);
-};
-// eslint-disable-next-line no-restricted-syntax
-export class ZinTrustWorkerShutdownDurableObject {
-    state;
-    constructor(state) {
-        this.state = state;
-    }
-    async fetch(request) {
-        const url = new URL(request.url);
-        const path = url.pathname;
-        if (request.method === 'GET' && path === '/status') {
-            const current = await loadState(this.state);
-            return new Response(JSON.stringify(current), {
-                status: 200,
-                headers: { 'content-type': 'application/json' },
-            });
-        }
-        if (request.method === 'POST' && path === '/shutdown') {
-            const payload = (await request.json().catch(() => ({})));
-            const next = {
-                shuttingDown: true,
-                startedAt: new Date().toISOString(),
-                reason: payload.reason ?? 'manual',
-            };
-            await saveState(this.state, next);
-            Logger.info('Worker shutdown requested via Durable Object', next);
-            return new Response(JSON.stringify({ ok: true }), {
-                status: 202,
-                headers: { 'content-type': 'application/json' },
-            });
-        }
-        return new Response('Not Found', { status: 404 });
-    }
-}