x

Author: markjmiller

examples/workers/script-upload.ts

@@ -1,46 +1,39 @@
 #!/usr/bin/env -S npm run tsn -T
 
-/*
- * Generate an API token: https://developers.cloudflare.com/fundamentals/api/get-started/create-token/
- * (Not Global API Key!)
+/**
+ * Generate an API token:
+ *   https://developers.cloudflare.com/fundamentals/api/get-started/create-token/
+ *   (Not Global API Key!)
  *
- * Find your account id: https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
+ * Find your account id:
+ *   https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
  *
  * Set these environment variables:
- * - CLOUDFLARE_API_TOKEN
- * - CLOUDFLARE_ACCOUNT_ID
- *
- * ### Workers for Platforms ###
- *
- * For uploading a User Worker to a dispatch namespace:
- * https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/
- *
- * Define a "dispatchNamespaceName" variable and change the entire "const script = " line to the following:
- * "const script = await client.workersForPlatforms.dispatch.namespaces.scripts.update(dispatchNamespaceName, scriptName, {"
+ *   - CLOUDFLARE_API_TOKEN
+ *   - CLOUDFLARE_ACCOUNT_ID
  */
 
 import Cloudflare from 'cloudflare';
-import { toFile } from 'cloudflare/index';
 
 const apiToken = process.env['CLOUDFLARE_API_TOKEN'] ?? '';
 if (!apiToken) {
-  throw new Error('Please set envar CLOUDFLARE_ACCOUNT_ID');
+  throw new Error('Please set envar CLOUDFLARE_API_TOKEN');
 }
 
 const accountID = process.env['CLOUDFLARE_ACCOUNT_ID'] ?? '';
 if (!accountID) {
-  throw new Error('Please set envar CLOUDFLARE_API_TOKEN');
+  throw new Error('Please set envar CLOUDFLARE_ACCOUNT_ID');
 }
 
 const client = new Cloudflare({
-  apiToken: apiToken,
+  apiToken,
 });
 
 async function main() {
-  const scriptName = 'my-hello-world-script';
-  const scriptFileName = `${scriptName}.mjs`;
+  const workerName = 'my-hello-world-worker';
+  const scriptFileName = `${workerName}.mjs`;
 
-  // Workers Scripts prefer Module Syntax
+  // Workers Scripts use ES Module Syntax
   // https://blog.cloudflare.com/workers-javascript-modules/
   const scriptContent = `
     export default {
@@ -50,38 +43,42 @@ async function main() {
     };
   `;
 
-  try {
-    // https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
-    const script = await client.workers.scripts.update(scriptName, {
-      account_id: accountID,
-      // https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/
-      metadata: {
-        main_module: scriptFileName,
-        bindings: [
-          {
-            type: 'plain_text',
-            name: 'MESSAGE',
-            text: 'Hello World!',
-          },
-        ],
+  const worker = await client.workers.create(workerName, {
+    account_id: accountID,
+  });
+
+  const version = await client.workers.scripts.create(worker.id, {
+    account_id: accountID,
+    main_module: scriptFileName,
+    compatibility_date: new Date().toISOString().split('T')[0],
+    bindings: [
+      {
+        type: 'plain_text',
+        name: 'MESSAGE',
+        text: 'Hello World!',
       },
-      files: {
-        // Add main_module file
-        [scriptFileName]: await toFile(Buffer.from(scriptContent), scriptFileName, {
-          type: 'application/javascript+module',
-        }),
-        // Can add other files, such as more modules or source maps
-        // [sourceMapFileName]: await toFile(Buffer.from(sourceMapContent), sourceMapFileName, {
-        //   type: 'application/source-map',
-        // }),
+    ],
+    modules: [
+      {
+        name: scriptFileName,
+        content_type: 'application/javascript+module',
+        content_base64: Buffer.from(scriptContent).toString('base64'),
       },
-    });
-    console.log('Script Upload success!');
-    console.log(JSON.stringify(script, null, 2));
-  } catch (error) {
-    console.error('Script Upload failure!');
-    console.error(error);
-  }
+    ],
+  });
+
+  const deployment = await client.workers.scripts.deployments.create(worker.name, {
+    account_id: accountID,
+    strategy: 'percentage',
+    versions: [
+      {
+        percentage: 100,
+        version_id: version.id,
+      },
+    ],
+  });
+
+  console.log(JSON.stringify(deployment, null, 2));
 }
 
 main();

examples/workers/script-with-assets-upload.ts

@@ -1,20 +1,21 @@
 #!/usr/bin/env -S npm run tsn -T
 
-/*
- * This is an example of how to upload a Worker with Static Assets and serve them from a Worker
+/**
+ * Example: Upload a Worker with Static Assets and serve them from a Worker
  * https://developers.cloudflare.com/workers/static-assets/direct-upload
  *
- * Generate an API token: https://developers.cloudflare.com/fundamentals/api/get-started/create-token/
- * (Not Global API Key!)
+ * Generate an API token:
+ *   https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ (Not Global API Key!)
  *
- * Find your account id: https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
+ * Find your account id:
+ *   https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
  *
  * Set these environment variables:
- * - CLOUDFLARE_API_TOKEN
- * - CLOUDFLARE_ACCOUNT_ID
- * - ASSETS_DIRECTORY
+ *   - CLOUDFLARE_API_TOKEN
+ *   - CLOUDFLARE_ACCOUNT_ID
+ *   - ASSETS_DIRECTORY
  *
- * In your assets directory, place files like html or images.
+ * In your assets directory, place files like HTML or images.
  *
  * After deployment, your assets will be available at:
  *   <worker-route>/<filename>  (e.g. example.com/cat.jpg)
@@ -33,12 +34,12 @@ import { UploadCreateParams } from 'cloudflare/resources/workers/scripts/assets'
 
 const apiToken = process.env['CLOUDFLARE_API_TOKEN'] ?? '';
 if (!apiToken) {
-  throw new Error('Please set envar CLOUDFLARE_ACCOUNT_ID');
+  throw new Error('Please set envar CLOUDFLARE_API_TOKEN');
 }
 
 const accountID = process.env['CLOUDFLARE_ACCOUNT_ID'] ?? '';
 if (!accountID) {
-  throw new Error('Please set envar CLOUDFLARE_API_TOKEN');
+  throw new Error('Please set envar CLOUDFLARE_ACCOUNT_ID');
 }
 
 const assetsDirectory = process.env['ASSETS_DIRECTORY'] ?? '';
@@ -47,7 +48,7 @@ if (!assetsDirectory) {
 }
 
 const client = new Cloudflare({
-  apiToken: apiToken,
+  apiToken,
 });
 
 /**
@@ -73,7 +74,7 @@ function createManifest(directory: string): Record<string, UploadCreateParams.Ma
         const fileContent = fs.readFileSync(fullPath);
         const extension = extname(relativePath).substring(1);
 
-        // Generate SHA-256 hash and encode in Base64
+        // Generate hash and encode in Base64
         const hash = crypto
           .createHash('sha256')
           .update(fileContent.toString('base64') + extension)
@@ -104,6 +105,12 @@ async function main() {
   const scriptContent = `
     export default {
       async fetch(request, env, ctx) {
+        if (request.url.pathname === '/') {
+          return new Response(
+            'Try going to /<filename> to serve an asset you uploaded!',
+            { status: 200 }
+          );
+        }
         return env.ASSETS.fetch(request);
       }
     };