update blob-storage

Signed-off-by: karthik2804 <[email protected]>

Author: karthik2804

examples/blob-storage/backblaze/.gitignore

@@ -2,4 +2,4 @@ node_modules
 dist
 target
 .spin/
-dist.js
+build/

examples/blob-storage/backblaze/.npmrc

@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json

examples/blob-storage/backblaze/README.md

@@ -4,14 +4,6 @@ This example showcases how to connect to and send messages using Backblaze B2 wi
 
 ## Prerequisites
 - `spin >=2.6.0`
-- 
-
-## Install Dependencies
-Install the necessary npm packages:
-
-```bash
-npm install
-```
 
 ## Setup the Example
 

examples/blob-storage/backblaze/config/knitwit.json

@@ -0,0 +1,9 @@
+{
+    "version": 1,
+    "project": {
+        "worlds": [
+            "spin-http"
+        ]
+    },
+    "packages": {}
+}

examples/blob-storage/backblaze/knitwit.json

@@ -4,23 +4,24 @@
     "description": "",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -n spin-http -o target/backblaze.wasm",
+        "build": "knitwit --out-dir build/wit/knitwit --out-world combined && npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/backblaze.wasm",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "keywords": [],
     "author": "",
     "license": "ISC",
     "devDependencies": {
-        "@types/uuid": "^10.0.0",
         "mkdirp": "^3.0.1",
         "ts-loader": "^9.4.1",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
+        "@fermyon/spin-sdk": "^3.0.0-rc1",
+        "itty-router": "^5.0.18",
         "@aws-sdk/client-s3": "^3.600.0",
-        "@fermyon/spin-sdk": "^2.0.0",
         "uuid": "^10.0.0"
     }
 }

examples/blob-storage/backblaze/package.json

@@ -11,9 +11,9 @@ route = "/..."
 component = "backblaze"
 
 [component.backblaze]
-source = "target/backblaze.wasm"
+source = "dist/backblaze.wasm"
 exclude_files = ["**/node_modules"]
-allowed_outbound_hosts = ['https://*:*']
+allowed_outbound_hosts = ["https://*.backblazeb2.com"]
 [component.backblaze.build]
-command = "npm run build"
-watch = ["src/**/*.ts", "package.json"]
+command = ["npm install", "npm run build"]
+watch = ["src/**/*.ts"]

examples/blob-storage/backblaze/spin.toml

@@ -1,36 +1,46 @@
+// https://itty.dev/itty-router/routers/autorouter
+import { AutoRouter } from 'itty-router';
 import {
-  CreateBucketCommand,
-  PutObjectCommand,
-  S3Client,
+    CreateBucketCommand,
+    PutObjectCommand,
+    S3Client,
 } from '@aws-sdk/client-s3';
-import { ResponseBuilder } from '@fermyon/spin-sdk';
 import { v4 as uuid } from 'uuid';
 
 const s3 = new S3Client({
-  endpoint: '<Backblaze b2 endpoint>',
-  region: '<>',
-  credentials: {
-    accessKeyId: '<>',
-    secretAccessKey: '<>',
-  },
+    endpoint: '<Backblaze b2 endpoint>',
+    region: '<>',
+    credentials: {
+        accessKeyId: '<>',
+        secretAccessKey: '<>',
+    },
 });
+let router = AutoRouter();
 
-export async function handler(_req: Request, res: ResponseBuilder) {
-  try {
-    let bucketName = 'spin-sdk-bucket-' + uuid();
-    let keyName = 'hello_world.txt';
-    await s3.send(new CreateBucketCommand({ Bucket: bucketName }));
+// Route ordering matters, the first route that matches will be used
+// Any route that does not return will be treated as a middleware
+// Any unmatched route will return a 404
+router
+    .get("/", async () => {
+        try {
+            let bucketName = 'spin-sdk-bucket-' + uuid();
+            let keyName = 'hello_world.txt';
+            await s3.send(new CreateBucketCommand({ Bucket: bucketName }));
 
-    await s3.send(
-      new PutObjectCommand({
-        Bucket: bucketName,
-        Key: keyName,
-        Body: 'Hello World!',
-      }),
-    );
-    res.send(`Successfully uploaded data to ${bucketName}/${keyName}`);
-  } catch (e: any) {
-    res.status(500);
-    res.send(`error: ${e}`);
-  }
-}
+            await s3.send(
+                new PutObjectCommand({
+                    Bucket: bucketName,
+                    Key: keyName,
+                    Body: 'Hello World!',
+                }),
+            );
+            return new Response(`Successfully uploaded data to ${bucketName}/${keyName}`);
+        } catch (e: any) {
+            return new Response(`error: ${e}`, { status: 500 });
+        }
+    })
+
+//@ts-ignore
+addEventListener('fetch', async (event: FetchEvent) => {
+    event.respondWith(router.fetch(event.request));
+});

examples/blob-storage/backblaze/src/index.ts

@@ -1,33 +1,35 @@
 const path = require('path');
-const SpinSdkPlugin = require('@fermyon/spin-sdk/plugins/webpack');
+const SpinSdkPlugin = require("@fermyon/spin-sdk/plugins/webpack")
 
 module.exports = {
-  entry: './src/spin.ts',
-  experiments: {
-    outputModule: true,
-  },
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
+    entry: './src/index.ts',
+    experiments: {
+        outputModule: true,
+    },
+    module: {
+        rules: [
+            {
+                test: /\.tsx?$/,
+                use: 'ts-loader',
+                exclude: /node_modules/,
+            },
+        ],
+    },
+    resolve: {
+        extensions: ['.tsx', '.ts', '.js'],
+    },
+    output: {
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
+        module: true,
+        library: {
+            type: "module",
+        }
+    },
+    plugins: [
+        new SpinSdkPlugin()
     ],
-  },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  output: {
-    path: path.resolve(__dirname, './'),
-    filename: 'dist.js',
-    module: true,
-    library: {
-      type: 'module',
+    optimization: {
+        minimize: false
     },
-  },
-  plugins: [new SpinSdkPlugin()],
-  optimization: {
-    minimize: false,
-  },
-};
+};