create-cloudflare 0.0.0-efd7f9764 → 0.0.0-efdba4f7f

package/templates/hello-world-durable-object/py/src/entry.py

@@ -0,0 +1,66 @@
+from workers import DurableObject, Response
+
+"""
+ * Welcome to Cloudflare Workers! This is your first Durable Objects application.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your Durable Object in action
+ * - Run `npm run deploy` to publish your application
+ *
+ * Learn more at https://developers.cloudflare.com/durable-objects
+"""
+
+"""
+ * Env provides a mechanism to reference bindings declared in wrangler.jsonc within Python
+ *
+ * @typedef {Object} Env
+ * @property {DurableObjectNamespace} MY_DURABLE_OBJECT - The Durable Object namespace binding
+"""
+
+# A Durable Object's behavior is defined in an exported Python class
+class MyDurableObject(DurableObject):
+    """
+     * The constructor is invoked once upon creation of the Durable Object, i.e. the first call to
+     * `DurableObjectStub::get` for a given identifier (no-op constructors can be omitted)
+     *
+     * @param {DurableObjectState} ctx - The interface for interacting with Durable Object state
+     * @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+    """
+    def __init__(self, ctx, env):
+        super().__init__(ctx, env)
+
+    """
+     * The Durable Object exposes an RPC method `say_hello` which will be invoked when when a Durable
+     *  Object instance receives a request from a Worker via the same method invocation on the stub
+     *
+     * @param {string} name - The name provided to a Durable Object instance from a Worker
+     * @returns {Promise<string>} The greeting to be sent back to the Worker
+    """
+    async def say_hello(self, name):
+        return f"Hello, {name}!"
+
+
+"""
+* This is the standard fetch handler for a Cloudflare Worker
+*
+* @param {Request} request - The request submitted to the Worker from the client
+* @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+* @param {ExecutionContext} ctx - The execution context of the Worker
+* @returns {Promise<Response>} The response to be sent back to the client
+"""
+async def on_fetch(request, env, ctx):
+    # Create a `DurableObjectId` for an instance of the `MyDurableObject`
+    # class named "foo". Requests from all Workers to the instance named
+    # "foo" will go to a single globally unique Durable Object instance.
+    id = env.MY_DURABLE_OBJECT.idFromName("foo")
+
+    # Create a stub to open a communication channel with the Durable
+    # Object instance.
+    stub = env.MY_DURABLE_OBJECT.get(id)
+
+    # Call the `say_hello()` RPC method on the stub to invoke the method on
+    # the remote Durable Object instance
+    greeting = await stub.say_hello("world")
+
+    return Response(greeting)
+

package/templates/hello-world-durable-object/py/uv.lock

@@ -0,0 +1,22 @@
+version = 1
+requires-python = ">=3.12"
+
+[[package]]
+name = "<TBD>"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "webtypy" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "webtypy", specifier = ">=0.1.7" }]
+
+[[package]]
+name = "webtypy"
+version = "0.1.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/89/c7a0311fdc73809fc2415be97767f085ff3e00c86546430034dc8465fee7/webtypy-0.1.7.tar.gz", hash = "sha256:1b7212719a949c802f3d60fac5f0d952eb503a92121409cf1ad9847d7c76a336", size = 104505 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/91/c731bdaa605279e00b28bfd2bf0ae67f48061d16890fb1c026924bfbd242/webtypy-0.1.7-py3-none-any.whl", hash = "sha256:f35e6d73a4e08783e23adfac271a11cda3a2bd1105499db70e4819244efed0ae", size = 103519 },
+]

package/templates/hello-world-durable-object/py/wrangler.jsonc

@@ -0,0 +1,27 @@
+{
+  "name": "<TBD>",
+  "main": "src/entry.py",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "python_workers"
+  ],
+  "migrations": [
+    {
+      "new_sqlite_classes": [
+        "MyDurableObject"
+      ],
+      "tag": "v1"
+    }
+  ],
+  "durable_objects": {
+    "bindings": [
+      {
+        "class_name": "MyDurableObject",
+        "name": "MY_DURABLE_OBJECT"
+      }
+    ]
+  },
+  "observability": {
+    "enabled": true
+  }
+}

package/templates/hello-world-durable-object/ts/src/index.ts

@@ -48,17 +48,18 @@ export default {
 	 * @returns The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx): Promise<Response> {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
 	},

package/templates/hello-world-durable-object/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
 		/* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "node",
-		/* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
 		/* Enable importing .json files */
 		"resolveJsonModule": true,
 

package/templates/hello-world-durable-object/ts/wrangler.jsonc

@@ -4,7 +4,7 @@
   "compatibility_date": "<TBD>",
   "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/c3.ts

@@ -3,10 +3,10 @@ import type { TemplateConfig } from "../../src/templates";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-durable-object-with-assets",
-	path: "templates-experimental/hello-world-durable-object-with-assets",
-	displayName: "Hello World - Worker Using Durable Objects with Assets",
+	path: "templates/hello-world-durable-object-with-assets",
+	displayName: "Worker + Durable Objects + Assets",
 	description:
-		"Get started with a basic stateful app to build projects like real-time chats, collaborative apps, and multiplayer games, which hosts assets",
+		"For full-stack applications requiring static assets, an API, and real-time coordination",
 	platform: "workers",
 	copyFiles: {
 		variants: {
@@ -16,6 +16,9 @@ const config: TemplateConfig = {
 			ts: {
 				path: "./ts",
 			},
+			python: {
+				path: "./py",
+			},
 		},
 	},
 };

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/js/public/index.html

@@ -4,6 +4,7 @@
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Hello, World!</title>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 	</head>
 	<body>
 		<h1 id="heading"></h1>

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/js/src/index.js

@@ -52,18 +52,19 @@ export default {
 	 * @returns {Promise<Response>} The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx) {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
-	},
+	}
 };

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/js/wrangler.jsonc

@@ -3,7 +3,7 @@
   "main": "src/index.js",
   "compatibility_date": "<TBD>",
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "durable_objects": {
@@ -14,9 +14,9 @@
       }
     ]
   },
-	"migrations": [
+  "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

package/templates/hello-world-durable-object-with-assets/py/.python-version

@@ -0,0 +1 @@
+3.12

package/templates/hello-world-durable-object-with-assets/py/README.md

@@ -0,0 +1,23 @@
+## Usage
+
+You can run the Worker defined by your new project by executing `wrangler dev` in this
+directory. This will start up an HTTP server and will allow you to iterate on your
+Worker without having to restart `wrangler`.
+
+### Types and autocomplete
+
+This project also includes a pyproject.toml and uv.lock file with some requirements which
+set up autocomplete and type hints for this Python Workers project.
+
+To get these installed you'll need `uv`, which you can install by following
+https://docs.astral.sh/uv/getting-started/installation/.
+
+Once `uv` is installed, you can run the following:
+
+```
+uv venv
+uv sync
+```
+
+Then point your editor's Python plugin at the `.venv` directory. You should then have working
+autocomplete and type information in your editor.

package/{templates-experimental/hello-world-durable-object-with-assets/ts → templates/hello-world-durable-object-with-assets/py}/public/index.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

package/templates/hello-world-durable-object-with-assets/py/pyproject.toml

@@ -0,0 +1,9 @@
+[project]
+name = "<TBD>"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "webtypy>=0.1.7",
+]

package/templates/hello-world-durable-object-with-assets/py/src/entry.py

@@ -0,0 +1,66 @@
+from workers import DurableObject, Response
+
+"""
+ * Welcome to Cloudflare Workers! This is your first Durable Objects application.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your Durable Object in action
+ * - Run `npm run deploy` to publish your application
+ *
+ * Learn more at https://developers.cloudflare.com/durable-objects
+"""
+
+"""
+ * Env provides a mechanism to reference bindings declared in wrangler.jsonc within Python
+ *
+ * @typedef {Object} Env
+ * @property {DurableObjectNamespace} MY_DURABLE_OBJECT - The Durable Object namespace binding
+"""
+
+# A Durable Object's behavior is defined in an exported Python class
+class MyDurableObject(DurableObject):
+    """
+     * The constructor is invoked once upon creation of the Durable Object, i.e. the first call to
+     * `DurableObjectStub::get` for a given identifier (no-op constructors can be omitted)
+     *
+     * @param {DurableObjectState} ctx - The interface for interacting with Durable Object state
+     * @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+    """
+    def __init__(self, ctx, env):
+        super().__init__(ctx, env)
+
+    """
+     * The Durable Object exposes an RPC method `say_hello` which will be invoked when when a Durable
+     *  Object instance receives a request from a Worker via the same method invocation on the stub
+     *
+     * @param {string} name - The name provided to a Durable Object instance from a Worker
+     * @returns {Promise<string>} The greeting to be sent back to the Worker
+    """
+    async def say_hello(self, name):
+        return f"Hello, {name}!"
+
+
+"""
+* This is the standard fetch handler for a Cloudflare Worker
+*
+* @param {Request} request - The request submitted to the Worker from the client
+* @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+* @param {ExecutionContext} ctx - The execution context of the Worker
+* @returns {Promise<Response>} The response to be sent back to the client
+"""
+async def on_fetch(request, env, ctx):
+    # Create a `DurableObjectId` for an instance of the `MyDurableObject`
+    # class named "foo". Requests from all Workers to the instance named
+    # "foo" will go to a single globally unique Durable Object instance.
+    id = env.MY_DURABLE_OBJECT.idFromName("foo")
+
+    # Create a stub to open a communication channel with the Durable
+    # Object instance.
+    stub = env.MY_DURABLE_OBJECT.get(id)
+
+    # Call the `say_hello()` RPC method on the stub to invoke the method on
+    # the remote Durable Object instance
+    greeting = await stub.say_hello("world")
+
+    return Response(greeting)
+

package/templates/hello-world-durable-object-with-assets/py/uv.lock

@@ -0,0 +1,22 @@
+version = 1
+requires-python = ">=3.12"
+
+[[package]]
+name = "<TBD>"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "webtypy" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "webtypy", specifier = ">=0.1.7" }]
+
+[[package]]
+name = "webtypy"
+version = "0.1.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/89/c7a0311fdc73809fc2415be97767f085ff3e00c86546430034dc8465fee7/webtypy-0.1.7.tar.gz", hash = "sha256:1b7212719a949c802f3d60fac5f0d952eb503a92121409cf1ad9847d7c76a336", size = 104505 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/91/c731bdaa605279e00b28bfd2bf0ae67f48061d16890fb1c026924bfbd242/webtypy-0.1.7-py3-none-any.whl", hash = "sha256:f35e6d73a4e08783e23adfac271a11cda3a2bd1105499db70e4819244efed0ae", size = 103519 },
+]

package/templates/hello-world-durable-object-with-assets/py/wrangler.jsonc

@@ -0,0 +1,31 @@
+{
+  "name": "<TBD>",
+  "main": "src/entry.py",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "python_workers"
+  ],
+  "assets": {
+    // The path to the directory containing the `index.html` file to be served at `/`
+    "directory": "./public"
+  },
+  "migrations": [
+    {
+      "new_sqlite_classes": [
+        "MyDurableObject"
+      ],
+      "tag": "v1"
+    }
+  ],
+  "durable_objects": {
+    "bindings": [
+      {
+        "class_name": "MyDurableObject",
+        "name": "MY_DURABLE_OBJECT"
+      }
+    ]
+  },
+  "observability": {
+    "enabled": true
+  }
+}

package/templates/hello-world-durable-object-with-assets/ts/public/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Hello, World!</title>
+	</head>
+	<body>
+		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
+		<script>
+			fetch('/message')
+				.then((resp) => resp.text())
+				.then((text) => {
+					const h1 = document.getElementById('heading');
+					h1.textContent = text;
+				});
+		</script>
+	</body>
+</html>

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/ts/src/index.ts

@@ -49,17 +49,18 @@ export default {
 	 * @returns The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx): Promise<Response> {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
 	},

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
     /* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "node",
-    /* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
     /* Enable importing .json files */
 		"resolveJsonModule": true,
 

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/ts/wrangler.jsonc

@@ -4,14 +4,14 @@
   "compatibility_date": "<TBD>",
   "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"
     }
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "durable_objects": {

package/templates/hello-world-with-assets/c3.ts

@@ -0,0 +1,25 @@
+import type { TemplateConfig } from "../../src/templates";
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "hello-world-with-assets",
+	path: "templates/hello-world-with-assets",
+	displayName: "SSR / full-stack app",
+	description:
+		"For sites with a backend API, or server-side rendering (SSR). Uses Static Assets with a Worker.",
+	platform: "workers",
+	copyFiles: {
+		variants: {
+			js: {
+				path: "./js",
+			},
+			ts: {
+				path: "./ts",
+			},
+			python: {
+				path: "./py",
+			},
+		},
+	},
+};
+export default config;

package/{templates-experimental → templates}/hello-world-with-assets/js/package.json

@@ -9,8 +9,8 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.6.4",
+		"@cloudflare/vitest-pool-workers": "^0.8.19",
 		"wrangler": "^3.101.0",
-		"vitest": "~2.1.9"
+		"vitest": "~3.0.7"
 	}
 }

package/{templates-experimental/hello-world-with-assets/py → templates/hello-world-with-assets/js}/public/index.html

@@ -7,8 +7,9 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
-		<button id="button">Fetch a random UUID</button>
-		<div id="random"></div>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
+		<button id="button" type="button">Fetch a random UUID</button>
+		<output id="random" for="button"></output>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

package/{templates-experimental → templates}/hello-world-with-assets/js/wrangler.jsonc

@@ -3,10 +3,11 @@
   "main": "src/index.js",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "observability": {

package/templates/hello-world-with-assets/py/.python-version

@@ -0,0 +1 @@
+3.12

package/templates/hello-world-with-assets/py/README.md

@@ -0,0 +1,23 @@
+## Usage
+
+You can run the Worker defined by your new project by executing `wrangler dev` in this
+directory. This will start up an HTTP server and will allow you to iterate on your
+Worker without having to restart `wrangler`.
+
+### Types and autocomplete
+
+This project also includes a pyproject.toml and uv.lock file with some requirements which
+set up autocomplete and type hints for this Python Workers project.
+
+To get these installed you'll need `uv`, which you can install by following
+https://docs.astral.sh/uv/getting-started/installation/.
+
+Once `uv` is installed, you can run the following:
+
+```
+uv venv
+uv sync
+```
+
+Then point your editor's Python plugin at the `.venv` directory. You should then have working
+autocomplete and type information in your editor.