package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartexpose",
-  "version": "1.0.6",
+  "version": "1.0.4",
   "private": false,
   "description": "a package to expose things to the internet",
   "main": "dist_ts/index.js",
@@ -36,12 +36,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://code.foss.global/push.rocks/smartexpose.git"
+    "url": "git+https://code.foss.global/push.rocks/smartexpose.git"
   },
   "bugs": {
     "url": "https://code.foss.global/push.rocks/smartexpose/issues"
   },
-  "homepage": "https://code.foss.global/push.rocks/smartexpose",
+  "homepage": "https://code.foss.global/push.rocks/smartexpose#readme",
   "browserslist": [
     "last 1 chrome versions"
   ],

readme.hints.md

@@ -1 +0,0 @@
- 

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartexpose',
-  version: '1.0.6',
+  version: '1.0.4',
   description: 'a package to expose things to the internet'
 }

ts/classes.exposeprovider.ts

@@ -28,16 +28,6 @@ export abstract class ExposeProvider {
     status: 'created' | 'updated';
   }>;
 
-  public abstract exposeFileArray(optionsArg: {
-    smartFiles: plugins.smartfile.SmartFile[],
-    deleteAfterMillis?: number,
-    privateUrl?: boolean,
-  }): Promise<{
-    url: string;
-    id: string;
-    status: 'created' | 'updated';
-  }[]>;
-
   public abstract start(): Promise<void>;
 
   public abstract stop(): Promise<void>;

ts/classes.exposeprovider.webdav.ts

@@ -39,50 +39,39 @@ export class WebDavExposeProvider extends ExposeProvider {
     this.webdavClient = new plugins.smartwebdav.WebdavClient(this.options.webdavCredentials);
     await this.ensureBaseDir();
     await this.houseKeeping();
-    this.smartExposeRef.taskmanager.addAndScheduleTask(
+    this.smartExposeRef.taskmanager.addAndScheduleTask(new plugins.taskbuffer.Task({
-      new plugins.taskbuffer.Task({
       name: 'webdavHousekeeping',
       taskFunction: async () => {
         await this.houseKeeping();
       },
-      }),
+    }), '0 * * * * *')
-      '0 * * * * *'
-    );
   }
 
   public async stop(): Promise<void> {
     // Nothing to do here
   }
 
-  public async exposeFile(
+  public async exposeFile(optionsArg: {
-    optionsArg: Parameters<ExposeProvider['exposeFile']>[0]
+    smartFile: plugins.smartfile.SmartFile;
-  ): Promise<{ url: string; id: string; status: 'created' | 'updated' }> {
+    deleteAfterMillis?: number;
+    privateUrl?: boolean;
+  }): Promise<{ url: string; id: string; status: 'created' | 'updated' }> {
     await this.ensureBaseDir();
     const fileId = plugins.smartunique.shortId(30);
-    console.log(
+    console.log(`Expsing file under id: ${fileId}. (${
-      `Expsing file under id: ${fileId}. (${plugins.smartformat.prettyBytes(
+      plugins.smartformat.prettyBytes(optionsArg.smartFile.contents.length)
-        optionsArg.smartFile.contents.length
+    })`);
-      )})`
-    );
     const webdavFilePath = await this.getFilePathById(fileId);
-    const fileToUpload = await plugins.smartfile.SmartFile.fromBuffer(
+    const fileToUpload = await plugins.smartfile.SmartFile.fromBuffer(webdavFilePath, optionsArg.smartFile.contents);
-      webdavFilePath,
-      optionsArg.smartFile.contents
-    );
     await this.webdavClient.uploadSmartFileArray([fileToUpload]);
     console.log(`checking file presence: ${webdavFilePath}`);
     const existsOnWebdav = await this.webdavClient.wdClient.exists(webdavFilePath);
-    const publicUrl = plugins.smartpath.join(
+    const publicUrl = plugins.smartpath.join(this.smartExposeRef.options.exposedBaseUrl, webdavFilePath);
-      this.smartExposeRef.options.exposedBaseUrl,
+    console.log(`cehcking for file at ${publicUrl}`)
-      webdavFilePath
-    );
-    console.log(`cehcking for file at ${publicUrl}`);
     const response = await plugins.smartrequest.getBinary(publicUrl);
     plugins.smartexpect.expect(response.body).toEqual(fileToUpload.contents);
     if (optionsArg.deleteAfterMillis) {
-      console.log(
+      console.log(`Scheduling deletion of file with id: ${fileId} in ${optionsArg.deleteAfterMillis}ms...`);
-        `Scheduling deletion of file with id: ${fileId} in ${optionsArg.deleteAfterMillis}ms...`
-      );
       plugins.smartdelay.delayFor(optionsArg.deleteAfterMillis).then(() => {
         console.log(`Deleting file with id: ${fileId}...`);
         this.deleteFileById(fileId);
@@ -96,20 +85,6 @@ export class WebDavExposeProvider extends ExposeProvider {
     };
   }
 
-  public async exposeFileArray(optionsArg: Parameters<ExposeProvider['exposeFileArray']>[0]) {
-    const returnArray = [];
-    for (const smartFile of optionsArg.smartFiles) {
-      returnArray.push(
-        await this.exposeFile({
-          smartFile,
-          deleteAfterMillis: optionsArg.deleteAfterMillis,
-          privateUrl: optionsArg.privateUrl,
-        })
-      );
-    }
-    return returnArray;
-  }
-
   public async wipeAll(): Promise<{ id: string; status: 'deleted' | 'failed' | 'notfound' }[]> {
     const directoryContents = await this.webdavClient.listDirectory(this.options.webdavSubPath);
     await this.webdavClient.ensureEmptyDirectory(this.options.webdavSubPath);

ts/classes.smartexpose.ts

@@ -42,8 +42,4 @@ export class SmartExpose {
   public async exposeFile(optionsArg: Parameters<ExposeProvider['exposeFile']>[0]) {
     return this.provider.exposeFile(optionsArg);
   }
-
-  public async exposeFileArray(optionsArg: Parameters<ExposeProvider['exposeFileArray']>[0]) {
-    return this.provider.exposeFileArray(optionsArg);
-  }
 }