@divizend/scratch-core 1.0.0 → 1.0.2

package/http-server/HttpServer.ts

@@ -2,7 +2,7 @@
  * HttpServer - Abstract HTTP server interface
  *
  * This interface defines the contract for HTTP server implementations.
- * Currently, only NativeHttpServer is implemented using Node's native http module.
+ * Currently, only ExpressHttpServer is implemented using Express.
  */
 
 import { ScratchEndpointDefinition, ScratchContext } from "../index";
@@ -21,12 +21,6 @@ export interface HttpServer {
    */
   stop(): Promise<void>;
 
-  /**
-   * Get the fetch handler for the server (for Bun/Cloudflare Workers)
-   * @returns Fetch handler function
-   */
-  getFetchHandler(): (request: Request) => Promise<Response>;
-
   /**
    * Register static file serving
    * @param rootPath - Root path for static files
@@ -34,10 +28,13 @@ export interface HttpServer {
   registerStaticFiles(rootPath: string): void;
 
   /**
-   * Load endpoints from a directory
-   * @param directoryPath - Absolute path to directory containing endpoint files
+   * Load endpoints from a URL
+   * @param url - URL to load endpoints from (file:// or https://github.com)
+   * @returns Statistics about loaded and failed endpoints
    */
-  loadEndpointsFromDirectory(directoryPath: string): Promise<void>;
+  loadEndpointsFromUrl(
+    url: string
+  ): Promise<{ loaded: number; failed: number; errors: string[] }>;
 
   /**
    * Get all endpoint definitions
@@ -85,6 +82,12 @@ export interface HttpServer {
     | undefined
   >;
 
+  /**
+   * Register the catch-all 404 handler
+   * This must be called AFTER all endpoints are loaded to ensure it's registered last
+   */
+  register404Handler(): void;
+
   /**
    * Register an endpoint from TypeScript source code (PUT operation - always overwrites)
    * @param source - TypeScript source code for the endpoint

package/http-server/default-endpoints/index.ts

@@ -0,0 +1,4 @@
+export { loadEndpoints } from "./loadEndpoints";
+export { loadEndpointsUI } from "./loadEndpointsUI";
+
+

package/http-server/default-endpoints/loadEndpoints.ts

@@ -0,0 +1,69 @@
+import { ScratchEndpointDefinition } from "../../index";
+
+export const loadEndpoints: ScratchEndpointDefinition = {
+  block: async () => ({
+    opcode: "loadEndpoints",
+    blockType: "command",
+    text: "load endpoints from URL [path] [jwt]",
+    schema: {
+      path: {
+        type: "string",
+        description:
+          "URL to load endpoints from (GitHub URL like https://github.com/owner/repo/tree/branch/path or file:// URL like file:///path/to/endpoints)",
+      },
+      jwt: {
+        type: "string",
+        description:
+          "JWT token for authentication (will be used for subsequent requests)",
+      },
+    },
+  }),
+  handler: async (context) => {
+    const { path } = context.inputs!;
+    if (!path || typeof path !== "string") {
+      throw new Error("path parameter is required and must be a string");
+    }
+
+    const endpointCountBefore =
+      context.universe!.httpServer.getAllEndpoints().length;
+    const result = await context.universe!.httpServer.loadEndpointsFromUrl(
+      path
+    );
+    const endpointCountAfter =
+      context.universe!.httpServer.getAllEndpoints().length;
+    const newEndpointsLoaded = endpointCountAfter - endpointCountBefore;
+
+    if (newEndpointsLoaded === 0 && result.failed > 0) {
+      throw new Error(
+        `Failed to load any endpoints from ${path}. ${
+          result.failed
+        } file(s) failed to load. Errors: ${result.errors
+          .slice(0, 5)
+          .join("; ")}${
+          result.errors.length > 5
+            ? ` (and ${result.errors.length - 5} more)`
+            : ""
+        }`
+      );
+    }
+
+    if (result.failed > 0) {
+      return {
+        success: true,
+        message: `Loaded ${newEndpointsLoaded} endpoint(s) from ${path} (${result.failed} file(s) failed)`,
+        totalEndpoints: endpointCountAfter,
+        loaded: result.loaded,
+        failed: result.failed,
+        errors: result.errors.slice(0, 10),
+      };
+    }
+
+    return {
+      success: true,
+      message: `Successfully loaded ${newEndpointsLoaded} endpoint(s) from ${path}`,
+      totalEndpoints: endpointCountAfter,
+      loaded: result.loaded,
+      failed: result.failed,
+    };
+  },
+};

package/http-server/default-endpoints/loadEndpointsUI.ts

@@ -0,0 +1,43 @@
+import { ScratchEndpointDefinition } from "../../index";
+
+export const loadEndpointsUI: ScratchEndpointDefinition = {
+  block: async () => ({
+    opcode: "loadEndpointsUI",
+    blockType: "reporter",
+    text: "load endpoints UI [jwt]",
+    schema: {
+      jwt: {
+        type: "string",
+        description: "JWT token for authentication",
+      },
+    },
+  }),
+  handler: async (context) => {
+    const { jwt } = context.inputs!;
+    const html = `<!DOCTYPE html>
+<html>
+<head>
+  <title>Load Endpoints</title>
+  <style>
+    body { font-family: system-ui, -apple-system, sans-serif; max-width: 600px; margin: 50px auto; padding: 20px; }
+    input[type="text"] { width: 100%; padding: 10px; font-size: 16px; border: 1px solid #ccc; border-radius: 4px; box-sizing: border-box; }
+    button { margin-top: 10px; padding: 10px 20px; font-size: 16px; background: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer; }
+    button:hover { background: #0056b3; }
+    label { display: block; margin-bottom: 5px; font-weight: 500; }
+  </style>
+</head>
+<body>
+  <h1>Load Endpoints</h1>
+  <p>No endpoints loaded yet. Enter a URL to load endpoints from:</p>
+  <form method="POST" action="/loadEndpoints">
+    <input type="hidden" name="jwt" value="${jwt || ""}">
+    <label for="path">Endpoint URL:</label>
+    <input type="text" id="path" name="path" placeholder="file:///path/to/endpoints or https://github.com/owner/repo/tree/branch/path" required>
+    <button type="submit">Load Endpoints</button>
+  </form>
+</body>
+</html>`;
+    return html;
+  },
+};
+

package/http-server/index.ts

@@ -1,3 +1,3 @@
 export * from "./HttpServer";
-export * from "./NativeHttpServer";
+export * from "./ExpressHttpServer";
 

package/index.ts

@@ -15,10 +15,53 @@
  * @author Divizend GmbH
  */
 
+console.log("[@divizend/scratch-core] Loading package/index.ts");
+console.log("[@divizend/scratch-core] import.meta.url:", import.meta.url);
+console.log(
+  "[@divizend/scratch-core] import.meta.dirname:",
+  import.meta.dirname
+);
+
+console.log("[@divizend/scratch-core] Exporting from ./basic");
 export * from "./basic";
+
+console.log("[@divizend/scratch-core] Exporting from ./core");
 export * from "./core";
+
+console.log("[@divizend/scratch-core] Exporting from ./gsuite");
 export * from "./gsuite";
+
+console.log("[@divizend/scratch-core] Exporting from ./http-server");
 export * from "./http-server";
+
+console.log("[@divizend/scratch-core] Exporting from ./resend");
 export * from "./resend";
+
+console.log("[@divizend/scratch-core] Exporting from ./s2");
 export * from "./s2";
+
+console.log("[@divizend/scratch-core] Exporting from ./queue");
 export * from "./queue";
+
+// After exports, check what's actually exported
+(async () => {
+  try {
+    const s2Module = await import("./s2");
+    console.log(
+      "[@divizend/scratch-core] s2 module keys:",
+      Object.keys(s2Module)
+    );
+    console.log(
+      "[@divizend/scratch-core] S2 class in s2 module:",
+      "S2" in s2Module
+    );
+    console.log(
+      "[@divizend/scratch-core] S2ReadResult in s2 module:",
+      "S2ReadResult" in s2Module
+    );
+  } catch (e) {
+    console.error("[@divizend/scratch-core] Error checking s2 module:", e);
+  }
+})();
+
+console.log("[@divizend/scratch-core] Finished loading package/index.ts");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divizend/scratch-core",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Core library for Scratch endpoint system",
   "main": "index.ts",
   "type": "module",
@@ -16,6 +16,7 @@
   "dependencies": {
     "@s2-dev/streamstore": "^0.18.1",
     "cloudevents": "^10.0.0",
+    "express": "^5.2.1",
     "google-auth-library": "^10.5.0",
     "googleapis": "^167.0.0",
     "jose": "^5.6.0",
@@ -26,6 +27,7 @@
   },
   "devDependencies": {
     "@types/bun": "^1.3.3",
+    "@types/express": "^5.0.0",
     "@types/mustache": "^4.2.6",
     "@types/node": "^24.10.1",
     "@types/turndown": "^5.0.6",

package/s2/index.ts

@@ -8,4 +8,23 @@
  * @author Divizend GmbH
  */
 
+console.log("[@divizend/scratch-core/s2] Loading s2/index.ts");
+console.log("[@divizend/scratch-core/s2] import.meta.url:", import.meta.url);
+
+console.log("[@divizend/scratch-core/s2] Exporting from ./S2");
 export * from "./S2";
+
+// After export, check what's actually exported
+(async () => {
+  try {
+    console.log("[@divizend/scratch-core/s2] Importing from ./S2 to verify");
+    const s2File = await import("./S2");
+    console.log("[@divizend/scratch-core/s2] S2.ts module keys:", Object.keys(s2File));
+    console.log("[@divizend/scratch-core/s2] S2 class exists:", "S2" in s2File);
+    console.log("[@divizend/scratch-core/s2] S2ReadResult exists:", "S2ReadResult" in s2File);
+    console.log("[@divizend/scratch-core/s2] Successfully verified ./S2 exports");
+  } catch (e) {
+    console.error("[@divizend/scratch-core/s2] Error verifying ./S2:", e);
+    console.error("[@divizend/scratch-core/s2] Error stack:", e instanceof Error ? e.stack : String(e));
+  }
+})();